SPARK_SUBMIT_JAVA_OPTS -> SPARK_SUBMIT_OPTS

bin/spark-class

@@ -75,9 +75,10 @@ case "$1" in
     OUR_JAVA_MEM=${SPARK_EXECUTOR_MEMORY:-$DEFAULT_MEM}
     ;;
 
-  # Spark submit uses SPARK_JAVA_OPTS + SPARK_SUBMIT_JAVA_OPTS + SPARK_DRIVER_MEMORY + SPARK_SUBMIT_DRIVER_MEMORY.
+  # Spark submit uses SPARK_JAVA_OPTS + SPARK_SUBMIT_OPTS +
+  # SPARK_DRIVER_MEMORY + SPARK_SUBMIT_DRIVER_MEMORY.
   'org.apache.spark.deploy.SparkSubmit')
-    OUR_JAVA_OPTS="$SPARK_JAVA_OPTS $SPARK_SUBMIT_JAVA_OPTS"
+    OUR_JAVA_OPTS="$SPARK_JAVA_OPTS $SPARK_SUBMIT_OPTS"
     OUR_JAVA_MEM=${SPARK_DRIVER_MEMORY:-$DEFAULT_MEM}
     if [ -n "$SPARK_SUBMIT_LIBRARY_PATH" ]; then
       OUR_JAVA_OPTS="$OUR_JAVA_OPTS -Djava.library.path=$SPARK_SUBMIT_LIBRARY_PATH"

bin/spark-submit

@@ -34,7 +34,7 @@ while (($#)); do
   elif [ "$1" = "--driver-class-path" ]; then
     export SPARK_SUBMIT_CLASSPATH=$2
   elif [ "$1" = "--driver-java-options" ]; then
-    export SPARK_SUBMIT_JAVA_OPTS=$2
+    export SPARK_SUBMIT_OPTS=$2
   fi
   shift
 done

core/src/main/scala/org/apache/spark/deploy/SparkSubmitDriverBootstrapper.scala

@@ -50,7 +50,7 @@ private[spark] object SparkSubmitDriverBootstrapper {
     val submitDriverMemory = sys.env.get("SPARK_SUBMIT_DRIVER_MEMORY")
     val submitLibraryPath = sys.env.get("SPARK_SUBMIT_LIBRARY_PATH")
     val submitClasspath = sys.env.get("SPARK_SUBMIT_CLASSPATH")
-    val submitJavaOpts = sys.env.get("SPARK_SUBMIT_JAVA_OPTS")
+    val submitJavaOpts = sys.env.get("SPARK_SUBMIT_OPTS")
 
     assume(runner != null, "RUNNER must be set")
     assume(classpath != null, "CLASSPATH must be set")
@@ -87,7 +87,7 @@ private[spark] object SparkSubmitDriverBootstrapper {
       }
     val newJavaOpts =
       if (submitJavaOpts.isDefined) {
-        // SPARK_SUBMIT_JAVA_OPTS is already captured in JAVA_OPTS
+        // SPARK_SUBMIT_OPTS is already captured in JAVA_OPTS
         javaOpts
       } else {
         javaOpts + " " + confJavaOpts