From 7bc9e1db2c47387ee693bcbeb4a8a2cbe11909cf Mon Sep 17 00:00:00 2001
From: jerryshao <sshao@hortonworks.com>
Date: Thu, 3 Dec 2015 11:05:12 -0800
Subject: [PATCH] [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.
---
.../main/scala/org/apache/spark/deploy/master/Master.scala | 5 +++--
1 file 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()
}
--
GitLab