diff options
| author | Carson Wang <carson.wang@intel.com> | 2016-03-29 11:07:58 -0700 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2016-03-29 11:07:58 -0700 |
| commit | 15c0b0006b3d04434b505210df541aeb28a51de8 (patch) | |
| tree | 2ec07cd04d358381d7e3615257270b67fbfae5df /core | |
| parent | d2a819a6363190b946986ebf6f8001d520098c3b (diff) | |
| download | spark-15c0b0006b3d04434b505210df541aeb28a51de8.tar.gz spark-15c0b0006b3d04434b505210df541aeb28a51de8.tar.bz2 spark-15c0b0006b3d04434b505210df541aeb28a51de8.zip | |
[SPARK-14232][WEBUI] Fix event timeline display issue when an executor is removed with a multiple line reason.
## What changes were proposed in this pull request?
The event timeline doesn't show on job page if an executor is removed with a multiple line reason. This PR replaces all new line characters in the reason string with spaces.
## How was this patch tested?
Verified on the Web UI.
Author: Carson Wang <carson.wang@intel.com>
Closes #12029 from carsonwang/eventTimeline.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala index d1c8b3089a..d5f15f160b 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala @@ -148,7 +148,7 @@ private[ui] class AllJobsPage(parent: JobsTab) extends WebUIPage("") { | 'Removed at ${UIUtils.formatDate(new Date(event.finishTime.get))}' + | '${ if (event.finishReason.isDefined) { - s"""<br>Reason: ${event.finishReason.get}""" + s"""<br>Reason: ${event.finishReason.get.replace("\n", " ")}""" } else { "" } diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala index 654d988807..645e2d2e36 100644 --- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala @@ -122,7 +122,7 @@ private[ui] class JobPage(parent: JobsTab) extends WebUIPage("job") { | 'Removed at ${UIUtils.formatDate(new Date(event.finishTime.get))}' + | '${ if (event.finishReason.isDefined) { - s"""<br>Reason: ${event.finishReason.get}""" + s"""<br>Reason: ${event.finishReason.get.replace("\n", " ")}""" } else { "" } |