diff options
| author | Christoph Grothaus <cgrothaus@zeb.de> | 2013-02-15 14:11:34 +0100 |
|---|---|---|
| committer | Christoph Grothaus <cgrothaus@zeb.de> | 2013-02-20 21:42:11 +0100 |
| commit | 85a35c68401e171df0b72b172a689d8c4e412199 (patch) | |
| tree | ff21c944fee0f8254b74f22e07d36970ba4e1a33 /run2.cmd | |
| parent | 05bc02e80be78d83937bf57f726946e297d0dd08 (diff) | |
| download | spark-85a35c68401e171df0b72b172a689d8c4e412199.tar.gz spark-85a35c68401e171df0b72b172a689d8c4e412199.tar.bz2 spark-85a35c68401e171df0b72b172a689d8c4e412199.zip | |
Fix SPARK-698. From ExecutorRunner, launch java directly instead via the run scripts.
Diffstat (limited to 'run2.cmd')
| -rw-r--r-- | run2.cmd | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -22,6 +22,8 @@ if "%1"=="spark.deploy.master.Master" set RUNNING_DAEMON=1 if "%1"=="spark.deploy.worker.Worker" set RUNNING_DAEMON=1 if "x%SPARK_DAEMON_MEMORY%" == "x" set SPARK_DAEMON_MEMORY=512m if "%RUNNING_DAEMON%"=="1" set SPARK_MEM=%SPARK_DAEMON_MEMORY% +rem Backup current SPARK_JAVA_OPTS for use in ExecutorRunner.scala +if "%RUNNING_DAEMON%"=="1" set SPARK_NONDAEMON_JAVA_OPTS=%SPARK_JAVA_OPTS% if "%RUNNING_DAEMON%"=="1" set SPARK_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS% rem Check that SCALA_HOME has been specified @@ -42,6 +44,7 @@ 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% 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 |