aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorDavies Liu <davies.liu@gmail.com>2015-12-17 08:01:27 -0800
committerDavies Liu <davies.liu@gmail.com>2015-12-17 08:01:27 -0800
commitcd3d937b0cc89cb5e4098f7d9f5db2712e3de71e (patch)
tree05e072cb1e4b77d67ec33fec6d30cf4b2a23e361 /core
parent5a514b61bbfb609c505d8d65f2483068a56f1f70 (diff)
downloadspark-cd3d937b0cc89cb5e4098f7d9f5db2712e3de71e.tar.gz
spark-cd3d937b0cc89cb5e4098f7d9f5db2712e3de71e.tar.bz2
spark-cd3d937b0cc89cb5e4098f7d9f5db2712e3de71e.zip
Revert "Once driver register successfully, stop it to connect to master."
This reverts commit 5a514b61bbfb609c505d8d65f2483068a56f1f70.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala1
1 files changed, 0 insertions, 1 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 3cf7464a15..1e2f469214 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,7 +130,6 @@ 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 {