Repository: spark Updated Branches: refs/heads/master d2a819a63 -> 15c0b0006
[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. ![timelineerror](https://cloud.githubusercontent.com/assets/9278199/14100211/5fd4cd30-f5be-11e5-9cea-f32651a4cd62.jpg) ## How was this patch tested? Verified on the Web UI. Author: Carson Wang <carson.w...@intel.com> Closes #12029 from carsonwang/eventTimeline. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/15c0b000 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/15c0b000 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/15c0b000 Branch: refs/heads/master Commit: 15c0b0006b3d04434b505210df541aeb28a51de8 Parents: d2a819a Author: Carson Wang <carson.w...@intel.com> Authored: Tue Mar 29 11:07:58 2016 -0700 Committer: Andrew Or <and...@databricks.com> Committed: Tue Mar 29 11:07:58 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/15c0b000/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 d1c8b30..d5f15f1 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 { "" } http://git-wip-us.apache.org/repos/asf/spark/blob/15c0b000/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 654d988..645e2d2 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 { "" } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org