aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorShixiong Zhu <shixiong@databricks.com>2016-02-29 11:52:11 -0800
committerAndrew Or <andrew@databricks.com>2016-02-29 11:52:11 -0800
commit644dbb641afd337ca39733da5153239cf39cdd81 (patch)
tree3ba7366c30007be855d91186cc1fa77ec022b9bb /core
parent17a253cbf4712dbeab06c454b5142917a1bba78b (diff)
downloadspark-644dbb641afd337ca39733da5153239cf39cdd81.tar.gz
spark-644dbb641afd337ca39733da5153239cf39cdd81.tar.bz2
spark-644dbb641afd337ca39733da5153239cf39cdd81.zip
[SPARK-13522][CORE] Fix the exit log place for heartbeat
## What changes were proposed in this pull request? Just fixed the log place introduced by #11401 ## How was this patch tested? unit tests. Author: Shixiong Zhu <shixiong@databricks.com> Closes #11432 from zsxwing/SPARK-13522-follow-up.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/executor/Executor.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala
index 86c121f787..a959f200d4 100644
--- a/core/src/main/scala/org/apache/spark/executor/Executor.scala
+++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala
@@ -478,9 +478,10 @@ private[spark] class Executor(
} catch {
case NonFatal(e) =>
logWarning("Issue communicating with driver in heartbeater", e)
- logError(s"Unable to send heartbeats to driver more than $HEARTBEAT_MAX_FAILURES times")
heartbeatFailures += 1
if (heartbeatFailures >= HEARTBEAT_MAX_FAILURES) {
+ logError(s"Exit as unable to send heartbeats to driver " +
+ s"more than $HEARTBEAT_MAX_FAILURES times")
System.exit(ExecutorExitCode.HEARTBEAT_FAILURE)
}
}