address Aaron's comments

CodingCat · CodingCat · commit 36a2ac0cfde2 · 2014-05-09T16:00:19.000-04:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -177,8 +177,7 @@ private[spark] class Master(
       logInfo("I have been elected leader! New state: " + state)
       if (state == RecoveryState.RECOVERING) {
         beginRecovery(storedApps, storedDrivers, storedWorkers)
-        recoverCallable = context.system.scheduler.scheduleOnce(WORKER_TIMEOUT millis)
-        { self ! CompleteRecovery }
+        recoverCallable = context.system.scheduler.scheduleOnce(WORKER_TIMEOUT millis, self, CompleteRecovery)
       }
     }
 
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/MasterMessages.scala b/core/src/main/scala/org/apache/spark/deploy/master/MasterMessages.scala
@@ -39,6 +39,4 @@ private[master] object MasterMessages {
   case object RequestWebUIPort
 
   case class WebUIPortResponse(webUIBoundPort: Int)
-
-  case object TriggerSchedule
 }

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,7 @@ private[spark] class Master(`
`177`	`177`	`logInfo("I have been elected leader! New state: " + state)`
`178`	`178`	`if (state == RecoveryState.RECOVERING) {`
`179`	`179`	`beginRecovery(storedApps, storedDrivers, storedWorkers)`
`180`		`- recoverCallable = context.system.scheduler.scheduleOnce(WORKER_TIMEOUT millis)`
`181`		`- { self ! CompleteRecovery }`
	`180`	`+ recoverCallable = context.system.scheduler.scheduleOnce(WORKER_TIMEOUT millis, self, CompleteRecovery)`
`182`	`181`	`}`
`183`	`182`	`}`
`184`	`183`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,4 @@ private[master] object MasterMessages {`
`39`	`39`	`case object RequestWebUIPort`
`40`	`40`
`41`	`41`	`case class WebUIPortResponse(webUIBoundPort: Int)`
`42`		`-`
`43`		`- case object TriggerSchedule`
`44`	`42`	`}`