From 96452eea56c289e25a711ca54c812723a5059739 Mon Sep 17 00:00:00 2001
From: "Y.CORP.YAHOO.COM\\tgraves" <tgraves@thatenemy-lm.champ.corp.yahoo.com>
Date: Fri, 30 Aug 2013 16:04:31 -0500
Subject: [PATCH] fix up minor things
---
core/src/main/scala/spark/ui/SparkUI.scala | 3 ++-
core/src/main/scala/spark/ui/UIUtils.scala | 8 ++++----
docs/running-on-yarn.md | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/src/main/scala/spark/ui/SparkUI.scala b/core/src/main/scala/spark/ui/SparkUI.scala
index e078c4a6b2..16bc053c2f 100644
--- a/core/src/main/scala/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/spark/ui/SparkUI.scala
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one or more
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
diff --git a/core/src/main/scala/spark/ui/UIUtils.scala b/core/src/main/scala/spark/ui/UIUtils.scala
index 6b45679f9d..92eff8ee6a 100644
--- a/core/src/main/scala/spark/ui/UIUtils.scala
+++ b/core/src/main/scala/spark/ui/UIUtils.scala
@@ -48,14 +48,14 @@ private[spark] object UIUtils {
/** Returns a spark page with correctly formatted headers */
def headerSparkPage(content: => Seq[Node], sc: SparkContext, title: String, page: Page.Value)
: Seq[Node] = {
- val storage = page match {
- case Storage => <li class="active"><a href={storageStr}>Storage</a></li>
- case _ => <li><a href={storageStr}>Storage</a></li>
- }
val jobs = page match {
case Jobs => <li class="active"><a href={stagesStr}>Jobs</a></li>
case _ => <li><a href={stagesStr}>Jobs</a></li>
}
+ val storage = page match {
+ case Storage => <li class="active"><a href={storageStr}>Storage</a></li>
+ case _ => <li><a href={storageStr}>Storage</a></li>
+ }
val environment = page match {
case Environment => <li class="active"><a href={envStr}>Environment</a></li>
case _ => <li><a href={envStr}>Environment</a></li>
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index 3f0d077f71..2f0d71fc35 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -49,7 +49,7 @@ Most of the configs are the same for Spark on YARN as other deploys. See the Con
Environment variables:
* `SPARK_YARN_USER_ENV`, to add environment variables to the Spark processes launched on YARN. This can be a comma separated list of environment variables. ie SPARK_YARN_USER_ENV="JAVA_HOME=/jdk64,FOO=bar"
-Properties:
+System Properties:
* 'spark.yarn.applicationMaster.waitTries', property to set the number of times the ApplicationMaster waits for the the spark master and then also the number of tries it waits for the Spark Context to be intialized. Default is 10.
# Launching Spark on YARN
--
GitLab