ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix up minor things

Browse source
This commit is contained in:
Y.CORP.YAHOO.COM\tgraves 2013-08-30 16:04:31 -05:00
parent bac46266a9
commit 96452eea56
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/scala/spark/ui/SparkUI.scala
View file

@ -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 * contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. * this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0 * The ASF licenses this file to You under the Apache License, Version 2.0

8
core/src/main/scala/spark/ui/UIUtils.scala
View file

@ -48,14 +48,14 @@ private[spark] object UIUtils {
/** Returns a spark page with correctly formatted headers */ /** Returns a spark page with correctly formatted headers */
def headerSparkPage(content: => Seq[Node], sc: SparkContext, title: String, page: Page.Value) def headerSparkPage(content: => Seq[Node], sc: SparkContext, title: String, page: Page.Value)
: Seq[Node] = { : 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 { val jobs = page match {
case Jobs => <li class="active"><a href={stagesStr}>Jobs</a></li> case Jobs => <li class="active"><a href={stagesStr}>Jobs</a></li>
case _ => <li><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 { val environment = page match {
case Environment => <li class="active"><a href={envStr}>Environment</a></li> case Environment => <li class="active"><a href={envStr}>Environment</a></li>
case _ => <li><a href={envStr}>Environment</a></li> case _ => <li><a href={envStr}>Environment</a></li>

2
docs/running-on-yarn.md
View file

@ -49,7 +49,7 @@ Most of the configs are the same for Spark on YARN as other deploys. See the Con
Environment variables: 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" * `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. * '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 # Launching Spark on YARN