aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorKousuke Saruta <sarutak@oss.nttdata.co.jp>2015-06-30 14:09:29 -0700
committerAndrew Or <andrew@databricks.com>2015-06-30 14:09:29 -0700
commitd2495f7cc7d7caaa50d122d2969ddb693e6ecebd (patch)
tree94298b3fd14452a096979649d2a5fe1efea9ac07 /core
parente72526227fdcf93b7a33375ef954746ac08753f5 (diff)
downloadspark-d2495f7cc7d7caaa50d122d2969ddb693e6ecebd.tar.gz
spark-d2495f7cc7d7caaa50d122d2969ddb693e6ecebd.tar.bz2
spark-d2495f7cc7d7caaa50d122d2969ddb693e6ecebd.zip
[SPARK-8739] [WEB UI] [WINDOWS] A illegal character `\r` can be contained in StagePage.
This issue was reported by saurfang. Thanks! There is a following code in StagePage.scala. ``` |width="$serializationTimeProportion%"></rect> |<rect class="getting-result-time-proportion" |x="$gettingResultTimeProportionPos%" y="0px" height="26px" |width="$gettingResultTimeProportion%"></rect></svg>', |'start': new Date($launchTime), |'end': new Date($finishTime) |} |""".stripMargin.replaceAll("\n", " ") ``` The last `replaceAll("\n", "")` doesn't work when we checkout and build source code on Windows and deploy on Linux. It's because when we checkout the source code on Windows, new-line-code is replaced with `"\r\n"` and `replaceAll("\n", "")` replaces only `"\n"`. Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp> Closes #7133 from sarutak/SPARK-8739 and squashes the following commits: 17fb044 [Kousuke Saruta] Fixed a new-line-code issue
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala2
1 files changed, 1 insertions, 1 deletions
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 17e7519ddd..60e3c63431 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
@@ -628,7 +628,7 @@ private[ui] class StagePage(parent: StagesTab) extends WebUIPage("stage") {
|'start': new Date($launchTime),
|'end': new Date($finishTime)
|}
- |""".stripMargin.replaceAll("\n", " ")
+ |""".stripMargin.replaceAll("""[\r\n]+""", " ")
timelineObject
}.mkString("[", ",", "]")