You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2016/02/26 02:08:03 UTC
spark git commit: [SPARK-13387][MESOS] Add support for
SPARK_DAEMON_JAVA_OPTS with MesosClusterDispatcher.
Repository: spark
Updated Branches:
refs/heads/master f2cfafdfe -> 712995757
[SPARK-13387][MESOS] Add support for SPARK_DAEMON_JAVA_OPTS with MesosClusterDispatcher.
## What changes were proposed in this pull request?
Add support for SPARK_DAEMON_JAVA_OPTS with MesosClusterDispatcher.
## How was the this patch tested?
Manual testing by launching dispatcher with SPARK_DAEMON_JAVA_OPTS
Author: Timothy Chen <tn...@gmail.com>
Closes #11277 from tnachen/cluster_dispatcher_opts.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/71299575
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/71299575
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/71299575
Branch: refs/heads/master
Commit: 712995757c22a0bd76e4ccb552446372acf2cc2e
Parents: f2cfafd
Author: Timothy Chen <tn...@gmail.com>
Authored: Thu Feb 25 17:07:58 2016 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 25 17:07:58 2016 -0800
----------------------------------------------------------------------
.../org/apache/spark/launcher/SparkClassCommandBuilder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/71299575/launcher/src/main/java/org/apache/spark/launcher/SparkClassCommandBuilder.java
----------------------------------------------------------------------
diff --git a/launcher/src/main/java/org/apache/spark/launcher/SparkClassCommandBuilder.java b/launcher/src/main/java/org/apache/spark/launcher/SparkClassCommandBuilder.java
index 931a24c..e575fd3 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/SparkClassCommandBuilder.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/SparkClassCommandBuilder.java
@@ -48,8 +48,8 @@ class SparkClassCommandBuilder extends AbstractCommandBuilder {
String memKey = null;
String extraClassPath = null;
- // Master, Worker, and HistoryServer use SPARK_DAEMON_JAVA_OPTS (and specific opts) +
- // SPARK_DAEMON_MEMORY.
+ // Master, Worker, HistoryServer, ExternalShuffleService, MesosClusterDispatcher use
+ // SPARK_DAEMON_JAVA_OPTS (and specific opts) + SPARK_DAEMON_MEMORY.
if (className.equals("org.apache.spark.deploy.master.Master")) {
javaOptsKeys.add("SPARK_DAEMON_JAVA_OPTS");
javaOptsKeys.add("SPARK_MASTER_OPTS");
@@ -69,6 +69,8 @@ class SparkClassCommandBuilder extends AbstractCommandBuilder {
} else if (className.equals("org.apache.spark.executor.MesosExecutorBackend")) {
javaOptsKeys.add("SPARK_EXECUTOR_OPTS");
memKey = "SPARK_EXECUTOR_MEMORY";
+ } else if (className.equals("org.apache.spark.deploy.mesos.MesosClusterDispatcher")) {
+ javaOptsKeys.add("SPARK_DAEMON_JAVA_OPTS");
} else if (className.equals("org.apache.spark.deploy.ExternalShuffleService") ||
className.equals("org.apache.spark.deploy.mesos.MesosExternalShuffleService")) {
javaOptsKeys.add("SPARK_DAEMON_JAVA_OPTS");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org