Repository: spark Updated Branches: refs/heads/branch-1.6 da7542f24 -> a8466489a
Revert "Once driver register successfully, stop it to connect to master." This reverts commit da7542f2408140a9a3b7ea245350976ac18676a5. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a8466489 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a8466489 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a8466489 Branch: refs/heads/branch-1.6 Commit: a8466489ab01e59fe07ba20adfc3983ec6928157 Parents: da7542f Author: Davies Liu <davies....@gmail.com> Authored: Thu Dec 17 08:01:59 2015 -0800 Committer: Davies Liu <davies....@gmail.com> Committed: Thu Dec 17 08:01:59 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/a8466489/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala ---------------------------------------------------------------------- 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 3cf7464..1e2f469 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 { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
