diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 15:47:40 -0400 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-25 15:47:40 -0400 |
| commit | 7e0191c6eabe7258f28a8b723702c3a089d1f4b3 (patch) | |
| tree | ca91077e408a5d879da953fc674825ef6342ee84 /run2.cmd | |
| parent | f5e32ed13a7820fdc38f56dd9a19c160800fd652 (diff) | |
| parent | f39f2b7636f52568a556987c8b7f7393299b0351 (diff) | |
| download | spark-7e0191c6eabe7258f28a8b723702c3a089d1f4b3.tar.gz spark-7e0191c6eabe7258f28a8b723702c3a089d1f4b3.tar.bz2 spark-7e0191c6eabe7258f28a8b723702c3a089d1f4b3.zip | |
Merge remote-tracking branch 'cgrothaus/SPARK-698'
Conflicts:
run
Diffstat (limited to 'run2.cmd')
| -rw-r--r-- | run2.cmd | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -23,7 +23,9 @@ if "%1"=="spark.deploy.worker.Worker" set RUNNING_DAEMON=1 if "x%SPARK_DAEMON_MEMORY%" == "x" set SPARK_DAEMON_MEMORY=512m set SPARK_DAEMON_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS% -Dspark.akka.logLifecycleEvents=true if "%RUNNING_DAEMON%"=="1" set SPARK_MEM=%SPARK_DAEMON_MEMORY% -if "%RUNNING_DAEMON%"=="1" set SPARK_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS% +rem Do not overwrite SPARK_JAVA_OPTS environment variable in this script +if "%RUNNING_DAEMON%"=="0" set OUR_JAVA_OPTS=%SPARK_JAVA_OPTS% +if "%RUNNING_DAEMON%"=="1" set OUR_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS% rem Check that SCALA_HOME has been specified if not "x%SCALA_HOME%"=="x" goto scala_exists @@ -40,9 +42,10 @@ rem variable so that our process sees it and can report it to Mesos if "x%SPARK_MEM%"=="x" set SPARK_MEM=512m rem Set JAVA_OPTS to be able to load native libraries and to set heap size -set JAVA_OPTS=%SPARK_JAVA_OPTS% -Djava.library.path=%SPARK_LIBRARY_PATH% -Xms%SPARK_MEM% -Xmx%SPARK_MEM% +set JAVA_OPTS=%OUR_JAVA_OPTS% -Djava.library.path=%SPARK_LIBRARY_PATH% -Xms%SPARK_MEM% -Xmx%SPARK_MEM% rem Load extra JAVA_OPTS from conf/java-opts, if it exists if exist "%FWDIR%conf\java-opts.cmd" call "%FWDIR%conf\java-opts.cmd" +rem Attention: when changing the way the JAVA_OPTS are assembled, the change must be reflected in ExecutorRunner.scala! set CORE_DIR=%FWDIR%core set REPL_DIR=%FWDIR%repl |