Re-add quotes to env vars. Add the new SPARK_NO_DAEMONIZE flag to the spark-env.sh.template file

mikejihbe · mikejihbe · commit 7010b28c7e7b · 2016-10-14T10:42:45.000-07:00
diff --git a/conf/spark-env.sh.template b/conf/spark-env.sh.template
@@ -63,3 +63,4 @@
 # - SPARK_PID_DIR       Where the pid file is stored. (Default: /tmp)
 # - SPARK_IDENT_STRING  A string representing this instance of spark. (Default: $USER)
 # - SPARK_NICENESS      The scheduling priority for daemons. (Default: 0)
+# - SPARK_NO_DAEMONIZE  Run the proposed command in the foreground. It will not output a PID file.
diff --git a/sbin/spark-daemon.sh b/sbin/spark-daemon.sh
@@ -131,7 +131,7 @@ execute_command() {
 
       echo "$newpid" > "$pid"
 
-      #Poll for up to 5 seconds for the java process to start
+      # Poll for up to 5 seconds for the java process to start
       for i in {1..10}
       do
         if [[ $(ps -p "$newpid" -o comm=) =~ "java" ]]; then
@@ -176,11 +176,11 @@ run_command() {
 
   case "$mode" in
     (class)
-      execute_command nice -n $SPARK_NICENESS ${SPARK_HOME}/bin/spark-class $command $@
+      execute_command nice -n "$SPARK_NICENESS" "${SPARK_HOME}"/bin/spark-class $command $@
       ;;
 
     (submit)
-      execute_command nice -n $SPARK_NICENESS bash ${SPARK_HOME}/bin/spark-submit --class $command $@
+      execute_command nice -n "$SPARK_NICENESS" bash "${SPARK_HOME}"/bin/spark-submit --class $command $@
       ;;
 
     (*)
