aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author郭小龙 10207633 <guo.xiaolong1@zte.com.cn>2017-04-23 13:33:14 +0100
committerSean Owen <sowen@cloudera.com>2017-04-23 13:33:14 +0100
commit2eaf4f3fe3595ae341a3a5ce886b859992dea5b2 (patch)
treec653b1ace19dc39b3c3d4fe396e88fa1b506da7d
parent8765bc17d0439032d0378686c4f2b17df2432abc (diff)
downloadspark-2eaf4f3fe3595ae341a3a5ce886b859992dea5b2.tar.gz
spark-2eaf4f3fe3595ae341a3a5ce886b859992dea5b2.tar.bz2
spark-2eaf4f3fe3595ae341a3a5ce886b859992dea5b2.zip
[SPARK-20385][WEB-UI] Submitted Time' field, the date format needs to be formatted, in running Drivers table or Completed Drivers table in master web ui.
## What changes were proposed in this pull request? Submitted Time' field, the date format **needs to be formatted**, in running Drivers table or Completed Drivers table in master web ui. Before fix this problem e.g. Completed Drivers Submission ID **Submitted Time** Worker State Cores Memory Main Class driver-20170419145755-0005 **Wed Apr 19 14:57:55 CST 2017** worker-20170419145250-zdh120-40412 FAILED 1 1024.0 MB cn.zte.HdfsTest please see the attachment:https://issues.apache.org/jira/secure/attachment/12863977/before_fix.png After fix this problem e.g. Completed Drivers Submission ID **Submitted Time** Worker State Cores Memory Main Class driver-20170419145755-0006 **2017/04/19 16:01:25** worker-20170419145250-zdh120-40412 FAILED 1 1024.0 MB cn.zte.HdfsTest please see the attachment:https://issues.apache.org/jira/secure/attachment/12863976/after_fix.png 'Submitted Time' field, the date format **has been formatted**, in running Applications table or Completed Applicationstable in master web ui, **it is correct.** e.g. Running Applications Application ID Name Cores Memory per Executor **Submitted Time** User State Duration app-20170419160910-0000 (kill) SparkSQL::10.43.183.120 1 5.0 GB **2017/04/19 16:09:10** root RUNNING 53 s **Format after the time easier to observe, and consistent with the applications table,so I think it's worth fixing.** ## How was this patch tested? (Please explain how this patch was tested. E.g. unit tests, integration tests, manual tests) (If this patch involves UI changes, please attach a screenshot; otherwise, remove this) Please review http://spark.apache.org/contributing.html before opening a pull request. Author: 郭小龙 10207633 <guo.xiaolong1@zte.com.cn> Author: guoxiaolong <guo.xiaolong1@zte.com.cn> Author: guoxiaolongzte <guo.xiaolong1@zte.com.cn> Closes #17682 from guoxiaolongzte/SPARK-20385.
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala2
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala2
-rw-r--r--resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/DriverPage.scala4
-rw-r--r--resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/MesosClusterPage.scala8
4 files changed, 8 insertions, 8 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
index 946a928821..a8d721f3e0 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -83,7 +83,7 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
<strong>Executor Memory:</strong>
{Utils.megabytesToString(app.desc.memoryPerExecutorMB)}
</li>
- <li><strong>Submit Date:</strong> {app.submitDate}</li>
+ <li><strong>Submit Date:</strong> {UIUtils.formatDate(app.submitDate)}</li>
<li><strong>State:</strong> {app.state}</li>
{
if (!app.isFinished) {
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index e722a24d4a..9351c72094 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -252,7 +252,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
}
<tr>
<td>{driver.id} {killLink}</td>
- <td>{driver.submitDate}</td>
+ <td>{UIUtils.formatDate(driver.submitDate)}</td>
<td>{driver.worker.map(w =>
if (w.isAlive()) {
<a href={UIUtils.makeHref(parent.master.reverseProxy, w.id, w.webUiAddress)}>
diff --git a/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/DriverPage.scala b/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/DriverPage.scala
index cd98110ddc..127fadabcc 100644
--- a/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/DriverPage.scala
+++ b/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/DriverPage.scala
@@ -101,7 +101,7 @@ private[ui] class DriverPage(parent: MesosClusterUI) extends WebUIPage("driver")
</tr>
<tr>
<td>Launch Time</td>
- <td>{state.startDate}</td>
+ <td>{UIUtils.formatDate(state.startDate)}</td>
</tr>
<tr>
<td>Finish Time</td>
@@ -154,7 +154,7 @@ private[ui] class DriverPage(parent: MesosClusterUI) extends WebUIPage("driver")
<td>Memory</td><td>{driver.mem}</td>
</tr>
<tr>
- <td>Submitted</td><td>{driver.submissionDate}</td>
+ <td>Submitted</td><td>{UIUtils.formatDate(driver.submissionDate)}</td>
</tr>
<tr>
<td>Supervise</td><td>{driver.supervise}</td>
diff --git a/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/MesosClusterPage.scala b/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/MesosClusterPage.scala
index 13ba7d311e..c9107c3e73 100644
--- a/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/MesosClusterPage.scala
+++ b/resource-managers/mesos/src/main/scala/org/apache/spark/deploy/mesos/ui/MesosClusterPage.scala
@@ -68,7 +68,7 @@ private[mesos] class MesosClusterPage(parent: MesosClusterUI) extends WebUIPage(
val id = submission.submissionId
<tr>
<td><a href={s"driver?id=$id"}>{id}</a></td>
- <td>{submission.submissionDate}</td>
+ <td>{UIUtils.formatDate(submission.submissionDate)}</td>
<td>{submission.command.mainClass}</td>
<td>cpus: {submission.cores}, mem: {submission.mem}</td>
</tr>
@@ -88,10 +88,10 @@ private[mesos] class MesosClusterPage(parent: MesosClusterUI) extends WebUIPage(
<tr>
<td><a href={s"driver?id=$id"}>{id}</a></td>
{historyCol}
- <td>{state.driverDescription.submissionDate}</td>
+ <td>{UIUtils.formatDate(state.driverDescription.submissionDate)}</td>
<td>{state.driverDescription.command.mainClass}</td>
<td>cpus: {state.driverDescription.cores}, mem: {state.driverDescription.mem}</td>
- <td>{state.startDate}</td>
+ <td>{UIUtils.formatDate(state.startDate)}</td>
<td>{state.slaveId.getValue}</td>
<td>{stateString(state.mesosTaskStatus)}</td>
</tr>
@@ -101,7 +101,7 @@ private[mesos] class MesosClusterPage(parent: MesosClusterUI) extends WebUIPage(
val id = submission.submissionId
<tr>
<td><a href={s"driver?id=$id"}>{id}</a></td>
- <td>{submission.submissionDate}</td>
+ <td>{UIUtils.formatDate(submission.submissionDate)}</td>
<td>{submission.command.mainClass}</td>
<td>{submission.retryState.get.lastFailureStatus}</td>
<td>{submission.retryState.get.nextRetry}</td>