aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/scala/org/apache/spark/SparkContext.scala
diff options
context:
space:
mode:
authorMatei Zaharia <matei@databricks.com>2013-12-29 22:19:33 -0500
committerMatei Zaharia <matei@databricks.com>2013-12-29 22:19:33 -0500
commit994f080f8ae3372366e6004600ba791c8a372ff0 (patch)
tree2b4ef5363c5a881dd98e98ca9eecd3c3d5f57371 /core/src/main/scala/org/apache/spark/SparkContext.scala
parenteaa8a68ff08304f713f4f75d39c61c020e0e691d (diff)
downloadspark-994f080f8ae3372366e6004600ba791c8a372ff0.tar.gz
spark-994f080f8ae3372366e6004600ba791c8a372ff0.tar.bz2
spark-994f080f8ae3372366e6004600ba791c8a372ff0.zip
Properly show Spark properties on web UI, and change app name property
Diffstat (limited to 'core/src/main/scala/org/apache/spark/SparkContext.scala')
-rw-r--r--core/src/main/scala/org/apache/spark/SparkContext.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
index 6f54fa7a5a..810ed1860b 100644
--- a/core/src/main/scala/org/apache/spark/SparkContext.scala
+++ b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -112,7 +112,7 @@ class SparkContext(
if (!conf.contains("spark.master")) {
throw new SparkException("A master URL must be set in your configuration")
}
- if (!conf.contains("spark.appName")) {
+ if (!conf.contains("spark.app.name")) {
throw new SparkException("An application must be set in your configuration")
}
@@ -127,7 +127,7 @@ class SparkContext(
}
val master = conf.get("spark.master")
- val appName = conf.get("spark.appName")
+ val appName = conf.get("spark.app.name")
val isLocal = (master == "local" || master.startsWith("local["))