You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2016/02/29 20:52:16 UTC
spark git commit: [SPARK-13522][CORE] Fix the exit log place for
heartbeat
Repository: spark
Updated Branches:
refs/heads/master 17a253cbf -> 644dbb641
[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 <sh...@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/644dbb64
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/644dbb64
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/644dbb64
Branch: refs/heads/master
Commit: 644dbb641afd337ca39733da5153239cf39cdd81
Parents: 17a253c
Author: Shixiong Zhu <sh...@databricks.com>
Authored: Mon Feb 29 11:52:11 2016 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Mon Feb 29 11:52:11 2016 -0800
----------------------------------------------------------------------
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/644dbb64/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 86c121f..a959f20 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)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org