diff options
| author | jerryshao <sshao@hortonworks.com> | 2015-12-03 11:05:12 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-12-03 11:05:12 -0800 |
| commit | 7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf (patch) | |
| tree | 6b955b352f878d1cabc48d9755cab9a89a09f0d3 /core | |
| parent | 8fa3e474a8ba180188361c0ad7e2704c3e2258d3 (diff) | |
| download | spark-7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf.tar.gz spark-7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf.tar.bz2 spark-7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf.zip | |
[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.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 5 |
1 files changed, 3 insertions, 2 deletions
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 1355e1ad1b..04b20e0d6a 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() } |