aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authortedyu <yuzhihong@gmail.com>2016-04-19 10:12:36 -0700
committerShixiong Zhu <shixiong@databricks.com>2016-04-19 10:12:36 -0700
commite89633605ea14547dcece35a7e12a9f0f78c5181 (patch)
tree8d362ae8e962f331114e5aa9efe149284950c54a /core
parent9ee95b6eccba41460b79c0aced9d00a39b5ae0c3 (diff)
downloadspark-e89633605ea14547dcece35a7e12a9f0f78c5181.tar.gz
spark-e89633605ea14547dcece35a7e12a9f0f78c5181.tar.bz2
spark-e89633605ea14547dcece35a7e12a9f0f78c5181.zip
[SPARK-13904] Add exit code parameter to exitExecutor()
## What changes were proposed in this pull request? This PR adds exit code parameter to exitExecutor() so that caller can specify different exit code. ## How was this patch tested? Existing test rxin hbhanawat Author: tedyu <yuzhihong@gmail.com> Closes #12457 from tedyu/master.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
index db5b774806..e087295109 100644
--- a/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
+++ b/core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala
@@ -64,7 +64,7 @@ private[spark] class CoarseGrainedExecutorBackend(
// Always receive `true`. Just ignore it
case Failure(e) =>
logError(s"Cannot register with driver: $driverUrl", e)
- exitExecutor()
+ exitExecutor(1)
}(ThreadUtils.sameThread)
}
@@ -81,12 +81,12 @@ private[spark] class CoarseGrainedExecutorBackend(
case RegisterExecutorFailed(message) =>
logError("Slave registration failed: " + message)
- exitExecutor()
+ exitExecutor(1)
case LaunchTask(data) =>
if (executor == null) {
logError("Received LaunchTask command but executor was null")
- exitExecutor()
+ exitExecutor(1)
} else {
val taskDesc = ser.deserialize[TaskDescription](data.value)
logInfo("Got assigned task " + taskDesc.taskId)
@@ -97,7 +97,7 @@ private[spark] class CoarseGrainedExecutorBackend(
case KillTask(taskId, _, interruptThread) =>
if (executor == null) {
logError("Received KillTask command but executor was null")
- exitExecutor()
+ exitExecutor(1)
} else {
executor.killTask(taskId, interruptThread)
}
@@ -127,7 +127,7 @@ private[spark] class CoarseGrainedExecutorBackend(
logInfo(s"Driver from $remoteAddress disconnected during shutdown")
} else if (driver.exists(_.address == remoteAddress)) {
logError(s"Driver $remoteAddress disassociated! Shutting down.")
- exitExecutor()
+ exitExecutor(1)
} else {
logWarning(s"An unknown ($remoteAddress) driver disconnected.")
}
@@ -146,7 +146,7 @@ private[spark] class CoarseGrainedExecutorBackend(
* executor exits differently. For e.g. when an executor goes down,
* back-end may not want to take the parent process down.
*/
- protected def exitExecutor(): Unit = System.exit(1)
+ protected def exitExecutor(code: Int): Unit = System.exit(code)
}
private[spark] object CoarseGrainedExecutorBackend extends Logging {