Only export variables if they exist

apache · Aug 7, 2014 · dec2343 · dec2343
1 parent fa2136e
commit dec2343
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/bin/spark-class b/bin/spark-class
@@ -75,8 +75,10 @@ case "$1" in
 
   # Spark submit uses SPARK_SUBMIT_OPTS and SPARK_JAVA_OPTS
     'org.apache.spark.deploy.SparkSubmit')
-    OUR_JAVA_OPTS="$SPARK_JAVA_OPTS $SPARK_SUBMIT_OPTS \
-      -Djava.library.path=$SPARK_SUBMIT_LIBRARY_PATH"
+    OUR_JAVA_OPTS="$SPARK_JAVA_OPTS $SPARK_SUBMIT_OPTS"
+    if [ -n "$SPARK_SUBMIT_LIBRARY_PATH" ]; then
+      OUR_JAVA_OPTS="$OUT_JAVA_OPTS -Djava.library.path=$SPARK_SUBMIT_LIBRARY_PATH"
+    fi
     OUR_JAVA_MEM=${SPARK_DRIVER_MEMORY:-$DEFAULT_MEM}
     ;;
 

diff --git a/bin/spark-submit b/bin/spark-submit
@@ -68,9 +68,15 @@ if [ $DEPLOY_MODE == "client" ]; then
     parse_config "spark.driver.extraClassPath";    DRIVER_EXTRA_CLASSPATH="$result"
     parse_config "spark.driver.extraLibraryPath";  DRIVER_EXTRA_LIBRARY_PATH="$result"
 
-    export SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS $DRIVER_EXTRA_JAVA_OPTS"
-    export SPARK_SUBMIT_CLASSPATH="$SPARK_SUBMIT_CLASSPATH:$DRIVER_EXTRA_CLASSPATH"
-    export SPARK_SUBMIT_LIBRARY_PATH="$SPARK_SUBMIT_LIBRARY_PATH:$DRIVER_EXTRA_LIBRARY_PATH"
+    if [ -n "$DRIVER_EXTRA_JAVA_OPTS" ]; then
+      export SPARK_SUBMIT_OPTS="$SPARK_SUBMIT_OPTS $DRIVER_EXTRA_JAVA_OPTS"
+    fi
+    if [ -n "$DRIVER_EXTRA_CLASSPATH" ]; then
+      export SPARK_SUBMIT_CLASSPATH="$SPARK_SUBMIT_CLASSPATH:$DRIVER_EXTRA_CLASSPATH"
+    fi
+    if [ -n "$DRIVER_EXTRA_LIBRARY_PATH" ]; then
+      export SPARK_SUBMIT_LIBRARY_PATH="$SPARK_SUBMIT_LIBRARY_PATH:$DRIVER_EXTRA_LIBRARY_PATH"
+    fi
   else
     echo "Warning: properties file $PROPERTIES_FILE does not exist!" 1>&2
   fi