Github user sryza commented on a diff in the pull request:
https://github.com/apache/spark/pull/4850#discussion_r25837956
--- Diff: core/src/main/scala/org/apache/spark/executor/Executor.scala ---
@@ -380,61 +387,70 @@ private[spark] class Executor(
}
}
- def startDriverHeartbeater() {
- val interval = conf.getInt("spark.executor.heartbeatInterval", 10000)
- val timeout = AkkaUtils.lookupTimeout(conf)
- val retryAttempts = AkkaUtils.numRetries(conf)
- val retryIntervalMs = AkkaUtils.retryWaitMs(conf)
- val heartbeatReceiverRef =
AkkaUtils.makeDriverRef("HeartbeatReceiver", conf, env.actorSystem)
+ private val timeout = AkkaUtils.lookupTimeout(conf)
+ private val retryAttempts = AkkaUtils.numRetries(conf)
+ private val retryIntervalMs = AkkaUtils.retryWaitMs(conf)
+ private val heartbeatReceiverRef =
+ AkkaUtils.makeDriverRef("HeartbeatReceiver", conf, env.actorSystem)
+
+ /** 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
+ val tasksMetrics = new ArrayBuffer[(Long, TaskMetrics)]()
+ val curGCTime = computeTotalGcTime()
+
+ for (taskRunner <- runningTasks.values()) {
+ if (taskRunner.task != null) {
+ taskRunner.task.metrics.foreach { metrics =>
+ metrics.updateShuffleReadMetrics()
+ metrics.updateInputMetrics()
+ metrics.setJvmGCTime(curGCTime - taskRunner.startGCTime)
+
+ if (isLocal) {
+ // JobProgressListener will hold an reference of it during
+ // onExecutorMetricsUpdate(), then JobProgressListener can not
see
+ // the changes of metrics any more, so make a deep copy of it
+ val copiedMetrics =
Utils.deserialize[TaskMetrics](Utils.serialize(metrics))
+ tasksMetrics += ((taskRunner.taskId, copiedMetrics))
+ } else {
+ // It will be copied by serialization
+ tasksMetrics += ((taskRunner.taskId, metrics))
+ }
+ }
+ }
+ }
- val t = new Thread() {
+ val message = Heartbeat(executorId, tasksMetrics.toArray,
env.blockManager.blockManagerId)
+ try {
+ val response = AkkaUtils.askWithReply[HeartbeatResponse](message,
heartbeatReceiverRef,
+ retryAttempts, retryIntervalMs, timeout)
+ if (response.reregisterBlockManager) {
+ logWarning("Told to re-register on heartbeat")
+ env.blockManager.reregister()
+ }
+ } catch {
+ case NonFatal(e) => logWarning("Issue communicating with driver in
heartbeater", e)
+ }
+ }
+
+ /**
+ * Starts a thread to report heartbeat and partial metrics for active
tasks to driver.
+ * This thread stops running when the executor is stopped.
+ */
+ private def startDriverHeartbeater() {
--- End diff --
`Unit =` for consistency
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
