Skip to content

[SPARK-17022][YARN]Handle potential deadlock in driver handling messages #14605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WangTaoTheTonic wants to merge 1 commit into from
Closed

[SPARK-17022][YARN]Handle potential deadlock in driver handling messages #14605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnSchedulerBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,20 @@ private[spark] abstract class YarnSchedulerBackend(
* This includes executors already pending or running.
*/
override def doRequestTotalExecutors(requestedTotal: Int): Boolean = {
yarnSchedulerEndpointRef.askWithRetry[Boolean](
RequestExecutors(requestedTotal, localityAwareTasks, hostToLocalTaskCount))
val r = RequestExecutors(requestedTotal, localityAwareTasks, hostToLocalTaskCount)
yarnSchedulerEndpoint.amEndpoint match {
case Some(am) =>
try {
am.askWithRetry[Boolean](r)
} catch {
case NonFatal(e) =>
logError(s"Sending $r to AM was unsuccessful", e)
return false
}
case None =>
logWarning("Attempted to request executors before the AM has registered!")
return false
}
}

/**
Expand Down Expand Up @@ -209,7 +221,7 @@ private[spark] abstract class YarnSchedulerBackend(
*/
private class YarnSchedulerEndpoint(override val rpcEnv: RpcEnv)
extends ThreadSafeRpcEndpoint with Logging {
private var amEndpoint: Option[RpcEndpointRef] = None
var amEndpoint: Option[RpcEndpointRef] = None

private val askAmThreadPool =
ThreadUtils.newDaemonCachedThreadPool("yarn-scheduler-ask-am-thread-pool")
Expand Down