spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andrewo...@apache.org
Subject spark git commit: [SPARK-12059][CORE] Avoid assertion error when unexpected state transition met in Master
Date Thu, 03 Dec 2015 19:05:25 GMT
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 f7ae62c45 -> 8865d87f7


[SPARK-12059][CORE] Avoid assertion error when unexpected state transition met in Master

Downgrade to warning log for unexpected state transition.

andrewor14 please review, thanks a lot.

Author: jerryshao <sshao@hortonworks.com>

Closes #10091 from jerryshao/SPARK-12059.

(cherry picked from commit 7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf)
Signed-off-by: Andrew Or <andrew@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8865d87f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8865d87f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8865d87f

Branch: refs/heads/branch-1.6
Commit: 8865d87f736e3c97d2193e609afb4e9b8f772aa2
Parents: f7ae62c
Author: jerryshao <sshao@hortonworks.com>
Authored: Thu Dec 3 11:05:12 2015 -0800
Committer: Andrew Or <andrew@databricks.com>
Committed: Thu Dec 3 11:05:20 2015 -0800

----------------------------------------------------------------------
 core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/8865d87f/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
----------------------------------------------------------------------
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 1355e1a..04b20e0 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
@@ -257,8 +257,9 @@ private[deploy] class Master(
           exec.state = state
 
           if (state == ExecutorState.RUNNING) {
-            assert(oldState == ExecutorState.LAUNCHING,
-              s"executor $execId state transfer from $oldState to RUNNING is illegal")
+            if (oldState != ExecutorState.LAUNCHING) {
+              logWarning(s"Executor $execId state transfer from $oldState to RUNNING is unexpected")
+            }
             appInfo.resetRetryCount()
           }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org


Mime
View raw message