diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java index b25715f785ac0..7d387d406edae 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java @@ -207,10 +207,10 @@ private List buildSparkSubmitCommand(Map env) throws IOE // - default value (512m) // Take Thrift Server as daemon String tsMemory = - isThriftServer(mainClass) ? System.getenv("SPARK_DAEMON_MEMORY") : null; + isThriftServer(mainClass) ? System.getenv("SPARK_DAEMON_MEMORY") : null; String memory = firstNonEmpty(tsMemory, - firstNonEmptyValue(SparkLauncher.DRIVER_MEMORY, conf, props), - System.getenv("SPARK_DRIVER_MEMORY"), System.getenv("SPARK_MEM"), DEFAULT_MEM); + firstNonEmptyValue(SparkLauncher.DRIVER_MEMORY, conf, props), + System.getenv("SPARK_DRIVER_MEMORY"), System.getenv("SPARK_MEM"), DEFAULT_MEM); cmd.add("-Xms" + memory); cmd.add("-Xmx" + memory); addOptionString(cmd, firstNonEmptyValue(SparkLauncher.DRIVER_EXTRA_JAVA_OPTIONS, conf, props)); @@ -305,7 +305,7 @@ private boolean isClientMode(Properties userProps) { */ private boolean isThriftServer(String mainClass) { return (mainClass != null && - mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2")); + mainClass.equals("org.apache.spark.sql.hive.thriftserver.HiveThriftServer2")); }