You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by pw...@apache.org on 2014/05/13 04:42:46 UTC
git commit: [SPARK-1780] Non-existent SPARK_DAEMON_OPTS is lurking
around
Repository: spark
Updated Branches:
refs/heads/master 156df87e7 -> ba96bb3d5
[SPARK-1780] Non-existent SPARK_DAEMON_OPTS is lurking around
What they really mean is SPARK_DAEMON_***JAVA***_OPTS
Author: Andrew Or <an...@gmail.com>
Closes #751 from andrewor14/spark-daemon-opts and squashes the following commits:
70c41f9 [Andrew Or] SPARK_DAEMON_OPTS -> SPARK_DAEMON_JAVA_OPTS
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/ba96bb3d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/ba96bb3d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/ba96bb3d
Branch: refs/heads/master
Commit: ba96bb3d591130075763706526f86fb2aaffa3ae
Parents: 156df87
Author: Andrew Or <an...@gmail.com>
Authored: Mon May 12 19:42:35 2014 -0700
Committer: Patrick Wendell <pw...@gmail.com>
Committed: Mon May 12 19:42:35 2014 -0700
----------------------------------------------------------------------
conf/spark-env.sh.template | 2 +-
core/src/main/scala/org/apache/spark/SparkConf.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/ba96bb3d/conf/spark-env.sh.template
----------------------------------------------------------------------
diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
index f906be6..4479e1e 100755
--- a/conf/spark-env.sh.template
+++ b/conf/spark-env.sh.template
@@ -39,5 +39,5 @@
# - SPARK_WORKER_DIR, to set the working directory of worker processes
# - SPARK_WORKER_OPTS, to set config properties only for the worker (e.g. "-Dx=y")
# - SPARK_HISTORY_OPTS, to set config properties only for the history server (e.g. "-Dx=y")
-# - SPARK_DAEMON_OPTS, to set config properties for all daemons (e.g. "-Dx=y")
+# - SPARK_DAEMON_JAVA_OPTS, to set config properties for all daemons (e.g. "-Dx=y")
# - SPARK_PUBLIC_DNS, to set the public dns name of the master or workers
http://git-wip-us.apache.org/repos/asf/spark/blob/ba96bb3d/core/src/main/scala/org/apache/spark/SparkConf.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
index bd21fdc..8006166 100644
--- a/core/src/main/scala/org/apache/spark/SparkConf.scala
+++ b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -247,7 +247,7 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging {
| - ./spark-submit with conf/spark-defaults.conf to set defaults for an application
| - ./spark-submit with --driver-java-options to set -X options for a driver
| - spark.executor.extraJavaOptions to set -X options for executors
- | - SPARK_DAEMON_OPTS to set java options for standalone daemons (i.e. master, worker)
+ | - SPARK_DAEMON_JAVA_OPTS to set java options for standalone daemons (master or worker)
""".stripMargin
logError(error)