aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorecho2mei <534384876@qq.com>2015-12-17 07:59:17 -0800
committerDavies Liu <davies.liu@gmail.com>2015-12-17 07:59:17 -0800
commit5a514b61bbfb609c505d8d65f2483068a56f1f70 (patch)
treecb5f648b52d1c8b177dafc0bc4c0788673d24e07 /core
parent9d66c4216ad830812848c657bbcd8cd50949e199 (diff)
downloadspark-5a514b61bbfb609c505d8d65f2483068a56f1f70.tar.gz
spark-5a514b61bbfb609c505d8d65f2483068a56f1f70.tar.bz2
spark-5a514b61bbfb609c505d8d65f2483068a56f1f70.zip
Once driver register successfully, stop it to connect to master.
This commit is to resolve SPARK-12396. Author: echo2mei <534384876@qq.com> Closes #10354 from echoTomei/master.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala b/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
index 1e2f469214..3cf7464a15 100644
--- a/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
@@ -130,6 +130,7 @@ private[spark] class AppClient(
if (registered.get) {
registerMasterFutures.get.foreach(_.cancel(true))
registerMasterThreadPool.shutdownNow()
+ registrationRetryTimer.cancel(true)
} else if (nthRetry >= REGISTRATION_RETRIES) {
markDead("All masters are unresponsive! Giving up.")
} else {