[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 <shixi...@databricks.com> Closes #11432 from zsxwing/SPARK-13522-follow-up. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ced71d35 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ced71d35 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ced71d35 Branch: refs/heads/branch-1.6 Commit: ced71d353a0908abcf5b83503661bef97ae0953d Parents: 86bf93e Author: Shixiong Zhu <shixi...@databricks.com> Authored: Mon Feb 29 11:52:11 2016 -0800 Committer: Andrew Or <and...@databricks.com> Committed: Wed May 11 11:29:10 2016 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/executor/Executor.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/ced71d35/core/src/main/scala/org/apache/spark/executor/Executor.scala ---------------------------------------------------------------------- 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 b8a1668..a3ebaff 100644 --- a/core/src/main/scala/org/apache/spark/executor/Executor.scala +++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala @@ -481,9 +481,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) } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
