Merge remote-tracking branch 'upstream/master' into conditionInfer

gatorsmile · gatorsmile · commit 918ea2ce80d2 · 2015-12-27T10:42:29.000-08:00
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
@@ -124,7 +124,7 @@ private[spark] class AppClient(
      */
     private def registerWithMaster(nthRetry: Int) {
       registerMasterFutures.set(tryRegisterAllMasters())
-      registrationRetryTimer.set(registrationRetryThread.scheduleAtFixedRate(new Runnable {
+      registrationRetryTimer.set(registrationRetryThread.schedule(new Runnable {
         override def run(): Unit = {
           Utils.tryOrExit {
             if (registered.get) {
@@ -138,7 +138,7 @@ private[spark] class AppClient(
             }
           }
         }
-      }, REGISTRATION_TIMEOUT_SECONDS, REGISTRATION_TIMEOUT_SECONDS, TimeUnit.SECONDS))
+      }, REGISTRATION_TIMEOUT_SECONDS, TimeUnit.SECONDS))
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private[spark] class AppClient(`
`124`	`124`	`*/`
`125`	`125`	`private def registerWithMaster(nthRetry: Int) {`
`126`	`126`	`registerMasterFutures.set(tryRegisterAllMasters())`
`127`		`- registrationRetryTimer.set(registrationRetryThread.scheduleAtFixedRate(new Runnable {`
	`127`	`+ registrationRetryTimer.set(registrationRetryThread.schedule(new Runnable {`
`128`	`128`	`override def run(): Unit = {`
`129`	`129`	`Utils.tryOrExit {`
`130`	`130`	`if (registered.get) {`
`@@ -138,7 +138,7 @@ private[spark] class AppClient(`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- }, REGISTRATION_TIMEOUT_SECONDS, REGISTRATION_TIMEOUT_SECONDS, TimeUnit.SECONDS))`
	`141`	`+ }, REGISTRATION_TIMEOUT_SECONDS, TimeUnit.SECONDS))`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/**`