diff options
| author | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2015-01-08 11:35:56 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-01-08 11:35:56 -0800 |
| commit | 0a597276dbfd921665a9f720d96e119058186aa4 (patch) | |
| tree | 9ca835bc9f4feb17825c21545a134c4c046aceed /core | |
| parent | 06dc4b5206a578065ebbb6bb8d54246ca007397f (diff) | |
| download | spark-0a597276dbfd921665a9f720d96e119058186aa4.tar.gz spark-0a597276dbfd921665a9f720d96e119058186aa4.tar.bz2 spark-0a597276dbfd921665a9f720d96e119058186aa4.zip | |
[Minor] Fix the value represented by spark.executor.id for consistency.
The property `spark.executor.id` can represent both `driver` and `<driver>` for one driver.
It's inconsistent.
This issue is minor so I didn't file this in JIRA.
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Closes #3812 from sarutak/fix-driver-identifier and squashes the following commits:
d885498 [Kousuke Saruta] Merge branch 'master' of git://git.apache.org/spark into fix-driver-identifier
4275663 [Kousuke Saruta] Fixed the value represented by spark.executor.id of local mode
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index 4c25d5d6c0..3bf3acd245 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -229,7 +229,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli // An asynchronous listener bus for Spark events private[spark] val listenerBus = new LiveListenerBus - conf.set("spark.executor.id", "driver") + conf.set("spark.executor.id", SparkContext.DRIVER_IDENTIFIER) // Create the Spark execution environment (cache, map output tracker, etc) private[spark] val env = SparkEnv.createDriverEnv(conf, isLocal, listenerBus) |