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

1 files changed, 5 insertions, 4 deletions

diff --git a/run b/run
index b5f693f1fa..e1482dafbe 100755
--- a/run
+++ b/run
@@ -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