diff options
| author | jerryshao <sshao@hortonworks.com> | 2015-12-15 18:24:23 -0800 |
|---|---|---|
| committer | Andrew Or <andrew@databricks.com> | 2015-12-15 18:24:23 -0800 |
| commit | 63ccdef81329e785807f37b4e918a9247fc70e3c (patch) | |
| tree | 593d610979db1106498066faf821bf6839508060 /launcher/src | |
| parent | 765a488494dac0ed38d2b81742c06467b79d96b2 (diff) | |
| download | spark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.gz spark-63ccdef81329e785807f37b4e918a9247fc70e3c.tar.bz2 spark-63ccdef81329e785807f37b4e918a9247fc70e3c.zip | |
[SPARK-10123][DEPLOY] Support specifying deploy mode from configuration
Please help to review, thanks a lot.
Author: jerryshao <sshao@hortonworks.com>
Closes #10195 from jerryshao/SPARK-10123.
Diffstat (limited to 'launcher/src')
| -rw-r--r-- | launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java | 3 | ||||
| -rw-r--r-- | launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java index dd1c93af6c..20e6003a00 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkLauncher.java @@ -40,6 +40,9 @@ public class SparkLauncher { /** The Spark master. */ public static final String SPARK_MASTER = "spark.master"; + /** The Spark deploy mode. */ + public static final String DEPLOY_MODE = "spark.submit.deployMode"; + /** Configuration key for the driver memory. */ public static final String DRIVER_MEMORY = "spark.driver.memory"; /** Configuration key for the driver class path. */ 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 312df0b269..a95f0f1751 100644 --- a/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java +++ b/launcher/src/main/java/org/apache/spark/launcher/SparkSubmitCommandBuilder.java @@ -294,10 +294,11 @@ class SparkSubmitCommandBuilder extends AbstractCommandBuilder { private boolean isClientMode(Map<String, String> userProps) { String userMaster = firstNonEmpty(master, userProps.get(SparkLauncher.SPARK_MASTER)); - // Default master is "local[*]", so assume client mode in that case. + String userDeployMode = firstNonEmpty(deployMode, userProps.get(SparkLauncher.DEPLOY_MODE)); + // Default master is "local[*]", so assume client mode in that case return userMaster == null || - "client".equals(deployMode) || - (!userMaster.equals("yarn-cluster") && deployMode == null); + "client".equals(userDeployMode) || + (!userMaster.equals("yarn-cluster") && userDeployMode == null); } /** |