Filter out JVM memory in Scala rather than Bash (minor)

Author: andrewor14

bin/spark-class

@@ -108,6 +108,7 @@ fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
 JAVA_OPTS="-XX:MaxPermSize=128m $OUR_JAVA_OPTS"
+JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM"
 
 # Load extra JAVA_OPTS from conf/java-opts, if it exists
 if [ -e "$FWDIR/conf/java-opts" ] ; then
@@ -169,7 +170,6 @@ if [ -n "$SPARK_SUBMIT_BOOTSTRAP_DRIVER" ]; then
   shift
   exec "$RUNNER" org.apache.spark.deploy.SparkSubmitDriverBootstrapper "$@"
 else
-  JAVA_OPTS="$JAVA_OPTS -Xms$OUR_JAVA_MEM -Xmx$OUR_JAVA_MEM"
   if [ -n "$SPARK_PRINT_LAUNCH_COMMAND" ]; then
     echo -n "Spark Command: " 1>&2
     echo "$RUNNER" -cp "$CLASSPATH" $JAVA_OPTS "$@" 1>&2

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

@@ -99,12 +99,16 @@ private[spark] object SparkSubmitDriverBootstrapper {
         javaOpts + confJavaOpts.map(" " + _).getOrElse("")
       }
 
+    val filteredJavaOpts = Utils.splitCommandString(newJavaOpts)
+      .filterNot(_.startsWith("-Xms"))
+      .filterNot(_.startsWith("-Xmx"))
+
     // Build up command
     val command: Seq[String] =
       Seq(runner) ++
       Seq("-cp", newClasspath) ++
       Seq(newLibraryPath) ++
-      Utils.splitCommandString(newJavaOpts) ++
+      filteredJavaOpts ++
       Seq(s"-Xms$newDriverMemory", s"-Xmx$newDriverMemory") ++
       Seq("org.apache.spark.deploy.SparkSubmit") ++
       submitArgs