diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-08-13 15:40:43 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-08-13 15:40:43 -0700 |
| commit | cdaa562c9a09e2e83e6df4e84d911ce1428a7a7c (patch) | |
| tree | 723a678a14fe4ba4f5f9a12bd3488c5484416bad /sql/core/src/test/scala | |
| parent | 67f025d90e6ba8c039ff45e26d34f20d24b92e6a (diff) | |
| download | spark-cdaa562c9a09e2e83e6df4e84d911ce1428a7a7c.tar.gz spark-cdaa562c9a09e2e83e6df4e84d911ce1428a7a7c.tar.bz2 spark-cdaa562c9a09e2e83e6df4e84d911ce1428a7a7c.zip | |
[SPARK-16966][SQL][CORE] App Name is a randomUUID even when "spark.app.name" exists
## What changes were proposed in this pull request?
Don't override app name specified in `SparkConf` with a random app name. Only set it if the conf has no app name even after options have been applied.
See also https://github.com/apache/spark/pull/14602
This is similar to Sherry302 's original proposal in https://github.com/apache/spark/pull/14556
## How was this patch tested?
Jenkins test, with new case reproducing the bug
Author: Sean Owen <sowen@cloudera.com>
Closes #14630 from srowen/SPARK-16966.2.
Diffstat (limited to 'sql/core/src/test/scala')
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala index 418345b9ee..386d13d07a 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/SparkSessionBuilderSuite.scala @@ -100,6 +100,7 @@ class SparkSessionBuilderSuite extends SparkFunSuite { assert(session.conf.get("key2") == "value2") assert(session.sparkContext.conf.get("key1") == "value1") assert(session.sparkContext.conf.get("key2") == "value2") + assert(session.sparkContext.conf.get("spark.app.name") == "test") session.stop() } |