diff options
author | Christoph Grothaus <cgrothaus@zeb.de> | 2013-02-24 21:24:30 +0100 |
---|---|---|
committer | Christoph Grothaus <cgrothaus@zeb.de> | 2013-02-24 21:24:30 +0100 |
commit | f39f2b7636f52568a556987c8b7f7393299b0351 (patch) | |
tree | b486cb88c9ff6fccef08687eef7673392c474596 /run | |
parent | 85a35c68401e171df0b72b172a689d8c4e412199 (diff) | |
download | spark-f39f2b7636f52568a556987c8b7f7393299b0351.tar.gz spark-f39f2b7636f52568a556987c8b7f7393299b0351.tar.bz2 spark-f39f2b7636f52568a556987c8b7f7393299b0351.zip |
Incorporate feedback from mateiz:
- we do not need getEnvOrEmpty
- Instead of saving SPARK_NONDAEMON_JAVA_OPTS, it would be better to modify the scripts to use a different variable name for the JAVA_OPTS they do eventually use
Diffstat (limited to 'run')
-rwxr-xr-x | run | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -22,9 +22,10 @@ fi # values for that; it doesn't need a lot if [ "$1" = "spark.deploy.master.Master" -o "$1" = "spark.deploy.worker.Worker" ]; then SPARK_MEM=${SPARK_DAEMON_MEMORY:-512m} - # Backup current SPARK_JAVA_OPTS for use in ExecutorRunner.scala - SPARK_NONDAEMON_JAVA_OPTS=$SPARK_JAVA_OPTS - SPARK_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS # Empty by default + # Do not overwrite SPARK_JAVA_OPTS environment variable in this script + OUR_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS # Empty by default +else + OUR_JAVA_OPTS=$SPARK_JAVA_OPTS fi if [ "$SPARK_LAUNCH_WITH_SCALA" == "1" ]; then @@ -64,7 +65,7 @@ fi export SPARK_MEM # Set JAVA_OPTS to be able to load native libraries and to set heap size -JAVA_OPTS="$SPARK_JAVA_OPTS" +JAVA_OPTS="$OUR_JAVA_OPTS" JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH" JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM" # Load extra JAVA_OPTS from conf/java-opts, if it exists |