diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-24 12:17:22 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2013-02-24 12:17:22 -0800 |
| commit | dff53d1b94f718a7a1140e56c72238f03a61ce25 (patch) | |
| tree | 503961d09c7c18348856aa86f90028c27b35f897 /run | |
| parent | 68c7934b1a442d7c83fd7d8f70bc03eee1c61c76 (diff) | |
| parent | 3b9f929467f3b14e780df459919a4d6c0c7ee772 (diff) | |
| download | spark-dff53d1b94f718a7a1140e56c72238f03a61ce25.tar.gz spark-dff53d1b94f718a7a1140e56c72238f03a61ce25.tar.bz2 spark-dff53d1b94f718a7a1140e56c72238f03a61ce25.zip | |
Merge branch 'mesos-master' into streaming
Diffstat (limited to 'run')
| -rwxr-xr-x | run | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -25,6 +25,26 @@ if [ "$1" = "spark.deploy.master.Master" -o "$1" = "spark.deploy.worker.Worker" SPARK_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS # Empty by default fi + +# Add java opts for master, worker, executor. The opts maybe null +case "$1" in + 'spark.deploy.master.Master') + SPARK_JAVA_OPTS+=" $SPARK_MASTER_OPTS" + ;; + 'spark.deploy.worker.Worker') + SPARK_JAVA_OPTS+=" $SPARK_WORKER_OPTS" + ;; + 'spark.executor.StandaloneExecutorBackend') + SPARK_JAVA_OPTS+=" $SPARK_EXECUTOR_OPTS" + ;; + 'spark.executor.MesosExecutorBackend') + SPARK_JAVA_OPTS+=" $SPARK_EXECUTOR_OPTS" + ;; + 'spark.repl.Main') + SPARK_JAVA_OPTS+=" $SPARK_REPL_OPTS" + ;; +esac + if [ "$SPARK_LAUNCH_WITH_SCALA" == "1" ]; then if [ `command -v scala` ]; then RUNNER="scala" |