Repository: spark Updated Branches: refs/heads/branch-1.6 c2ce247ea -> 84ad2544f
[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 <[email protected]> Closes #12029 from carsonwang/eventTimeline. (cherry picked from commit 15c0b0006b3d04434b505210df541aeb28a51de8) Signed-off-by: Andrew Or <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/84ad2544 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/84ad2544 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/84ad2544 Branch: refs/heads/branch-1.6 Commit: 84ad2544f900e264a6a0bb32e317d11b77c75487 Parents: c2ce247 Author: Carson Wang <[email protected]> Authored: Tue Mar 29 11:07:58 2016 -0700 Committer: Andrew Or <[email protected]> Committed: Tue Mar 29 11:08:12 2016 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala | 2 +- core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/84ad2544/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala ---------------------------------------------------------------------- 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 e65ab2c..47d6c36 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 @@ -143,7 +143,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 { "" } http://git-wip-us.apache.org/repos/asf/spark/blob/84ad2544/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala ---------------------------------------------------------------------- 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 2cad0a7..6a35f0e 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 @@ -123,7 +123,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 { "" } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
