From eb5d5efdb404df9f25d4be44fb1f9df4ee36bdb3 Mon Sep 17 00:00:00 2001
From: gavingavinno1 <1003540336@qq.com>
Date: Wed, 30 Mar 2016 11:36:48 +0800
Subject: [PATCH] correct appStatus after master leader changed

---
 .../main/scala/org/apache/spark/deploy/master/Master.scala  | 6 +++++-
 1 file changed, 5 insertions(+), 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
index 01901bbf85d73..11f9e9a690e6f 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -333,7 +333,11 @@ private[deploy] class Master(
       idToApp.get(appId) match {
         case Some(app) =>
           logInfo("Application has been re-registered: " + appId)
-          app.state = ApplicationState.WAITING
+          if (app.coresLeft > 0) {
+            app.state = ApplicationState.WAITING
+          } else {
+            app.state = ApplicationState.RUNNING
+          }
         case None =>
           logWarning("Master change ack from unknown app: " + appId)
       }