From e89902854b721c6ff4202ab2dec154c6a9663bb5 Mon Sep 17 00:00:00 2001
From: daile <726575153@qq.com>
Date: Fri, 27 Dec 2019 23:53:56 +0800
Subject: [PATCH 1/2] change task webui duration

---
 core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index 13e97b13fb5a..c573e82381c0 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -848,7 +848,7 @@ private[ui] class TaskPagedTable(
         </div>
       </td>
       <td>{UIUtils.formatDate(task.launchTime)}</td>
-      <td>{formatDuration(task.taskMetrics.map(_.executorRunTime))}</td>
+      <td>{formatDuration(task.duration)}</td>
       <td class={TaskDetailsClassNames.SCHEDULER_DELAY}>
         {UIUtils.formatDuration(AppStatusUtils.schedulerDelay(task))}
       </td>

From a63a4bb4ac36e98e45dc999cb50dcbf4e5ea6794 Mon Sep 17 00:00:00 2001
From: daile <726575153@qq.com>
Date: Sun, 29 Dec 2019 01:45:32 +0800
Subject: [PATCH 2/2] change task running status duration from TaskInfo

---
 .../scala/org/apache/spark/status/LiveEntity.scala  | 13 +++++++++----
 .../scala/org/apache/spark/ui/jobs/StagePage.scala  |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/src/main/scala/org/apache/spark/status/LiveEntity.scala b/core/src/main/scala/org/apache/spark/status/LiveEntity.scala
index ad3d3bffafe2..dc7c84f9ee33 100644
--- a/core/src/main/scala/org/apache/spark/status/LiveEntity.scala
+++ b/core/src/main/scala/org/apache/spark/status/LiveEntity.scala
@@ -175,10 +175,15 @@ private class LiveTask(
   }
 
   override protected def doUpdate(): Any = {
-    val duration = if (info.finished) {
-      info.duration
+    var duration: Long = 0
+    var executorRunTime: Long = 0
+
+    if (info.finished) {
+      duration = info.duration
+      executorRunTime = metrics.executorRunTime
     } else {
-      info.timeRunning(lastUpdateTime.getOrElse(System.currentTimeMillis()))
+      duration = info.timeRunning(lastUpdateTime.getOrElse(System.currentTimeMillis()))
+      executorRunTime = duration
     }
 
     new TaskDataWrapper(
@@ -198,7 +203,7 @@ private class LiveTask(
 
       metrics.executorDeserializeTime,
       metrics.executorDeserializeCpuTime,
-      metrics.executorRunTime,
+      executorRunTime,
       metrics.executorCpuTime,
       metrics.resultSize,
       metrics.jvmGcTime,
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index c573e82381c0..13e97b13fb5a 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -848,7 +848,7 @@ private[ui] class TaskPagedTable(
         </div>
       </td>
       <td>{UIUtils.formatDate(task.launchTime)}</td>
-      <td>{formatDuration(task.duration)}</td>
+      <td>{formatDuration(task.taskMetrics.map(_.executorRunTime))}</td>
       <td class={TaskDetailsClassNames.SCHEDULER_DELAY}>
         {UIUtils.formatDuration(AppStatusUtils.schedulerDelay(task))}
       </td>