Repository: spark Updated Branches: refs/heads/master 8fa3e474a -> 7bc9e1db2
[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 <ss...@hortonworks.com> Closes #10091 from jerryshao/SPARK-12059. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7bc9e1db Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7bc9e1db Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7bc9e1db Branch: refs/heads/master Commit: 7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf Parents: 8fa3e47 Author: jerryshao <ss...@hortonworks.com> Authored: Thu Dec 3 11:05:12 2015 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Thu Dec 3 11:05:12 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/7bc9e1db/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-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
