retryTimer -> registrationRetryTimer

Author: markhamstra

core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala

@@ -60,7 +60,7 @@ private[spark] class AppClient(
     var master: ActorSelection = null
     var alreadyDisconnected = false  // To avoid calling listener.disconnected() multiple times
     var alreadyDead = false  // To avoid calling listener.dead() multiple times
-    var retryTimer: Option[Cancellable] = None
+    var registrationRetryTimer: Option[Cancellable] = None
 
     override def preStart() {
       context.system.eventStream.subscribe(self, classOf[RemotingLifecycleEvent])
@@ -86,11 +86,11 @@ private[spark] class AppClient(
       tryRegisterAllMasters()
       import context.dispatcher
       var retries = 0
-      retryTimer = Some {
+      registrationRetryTimer = Some {
         context.system.scheduler.schedule(REGISTRATION_TIMEOUT, REGISTRATION_TIMEOUT) {
           retries += 1
           if (registered) {
-            retryTimer.foreach(_.cancel())
+            registrationRetryTimer.foreach(_.cancel())
           } else if (retries >= REGISTRATION_RETRIES) {
             logError("All masters are unresponsive! Giving up.")
             markDead()
@@ -181,7 +181,7 @@ private[spark] class AppClient(
     }
 
     override def postStop() {
-      retryTimer.foreach(_.cancel())
+      registrationRetryTimer.foreach(_.cancel())
     }
 
   }

core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala

@@ -102,7 +102,7 @@ private[spark] class Worker(
   val metricsSystem = MetricsSystem.createMetricsSystem("worker", conf, securityMgr)
   val workerSource = new WorkerSource(this)
 
-  var retryTimer: Option[Cancellable] = None
+  var registrationRetryTimer: Option[Cancellable] = None
 
   def coresFree: Int = cores - coresUsed
   def memoryFree: Int = memory - memoryUsed
@@ -166,11 +166,11 @@ private[spark] class Worker(
   def registerWithMaster() {
     tryRegisterAllMasters()
     var retries = 0
-    retryTimer = Some {
+    registrationRetryTimer = Some {
       context.system.scheduler.schedule(REGISTRATION_TIMEOUT, REGISTRATION_TIMEOUT) {
         retries += 1
         if (registered) {
-          retryTimer.foreach(_.cancel())
+          registrationRetryTimer.foreach(_.cancel())
         } else if (retries >= REGISTRATION_RETRIES) {
           logError("All masters are unresponsive! Giving up.")
           System.exit(1)
@@ -347,7 +347,7 @@ private[spark] class Worker(
   }
 
   override def postStop() {
-    retryTimer.foreach(_.cancel())
+    registrationRetryTimer.foreach(_.cancel())
     executors.values.foreach(_.kill())
     drivers.values.foreach(_.kill())
     webUi.stop()