diff options
| author | CodingCat <zhunansjtu@gmail.com> | 2015-11-30 17:19:26 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-11-30 17:19:26 -0800 |
| commit | 0a46e4377216a1f7de478f220c3b3042a77789e2 (patch) | |
| tree | 282400d1812e391da60ed7795705efb0db1701a3 /core | |
| parent | e6dc89a33951e9197a77dbcacf022c27469ae41e (diff) | |
| download | spark-0a46e4377216a1f7de478f220c3b3042a77789e2.tar.gz spark-0a46e4377216a1f7de478f220c3b3042a77789e2.tar.bz2 spark-0a46e4377216a1f7de478f220c3b3042a77789e2.zip | |
[SPARK-12037][CORE] initialize heartbeatReceiverRef before calling startDriverHeartbeat
https://issues.apache.org/jira/browse/SPARK-12037
a simple fix by changing the order of the statements
Author: CodingCat <zhunansjtu@gmail.com>
Closes #10032 from CodingCat/SPARK-12037.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/executor/Executor.scala | 7 |
1 files changed, 4 insertions, 3 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 6154f06e3a..7b68dfe5ad 100644 --- a/core/src/main/scala/org/apache/spark/executor/Executor.scala +++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala @@ -109,6 +109,10 @@ private[spark] class Executor( // Executor for the heartbeat task. private val heartbeater = ThreadUtils.newDaemonSingleThreadScheduledExecutor("driver-heartbeater") + // must be initialized before running startDriverHeartbeat() + private val heartbeatReceiverRef = + RpcUtils.makeDriverRef(HeartbeatReceiver.ENDPOINT_NAME, conf, env.rpcEnv) + startDriverHeartbeater() def launchTask( @@ -411,9 +415,6 @@ private[spark] class Executor( } } - private val heartbeatReceiverRef = - RpcUtils.makeDriverRef(HeartbeatReceiver.ENDPOINT_NAME, conf, env.rpcEnv) - /** Reports heartbeat and metrics for active tasks to the driver. */ private def reportHeartBeat(): Unit = { // list of (task id, metrics) to send back to the driver |