keep schedule() calling in the main thread

markhamstra · May 5, 2014 · 02b37ca · 02b37ca
1 parent fb05432
commit 02b37ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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
@@ -175,6 +175,8 @@ private[spark] class Master(
       }
     }
 
+    case TriggerSchedule => schedule()
+
     case RevokedLeadership => {
       logError("Leadership has been revoked -- master shutting down.")
       System.exit(0)
@@ -448,7 +450,7 @@ private[spark] class Master(
     }
 
     state = RecoveryState.ALIVE
-    schedule()
+    self ! TriggerSchedule
     logInfo("Recovery complete - resuming operations!")
   }
 

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,4 +39,6 @@ private[master] object MasterMessages {
   case object RequestWebUIPort
 
   case class WebUIPortResponse(webUIBoundPort: Int)
+
+  case object TriggerSchedule
 }