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 /run | |
| 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 'run')
| -rwxr-xr-x | run | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -22,6 +22,8 @@ fi # values for that; it doesn't need a lot if [ "$1" = "spark.deploy.master.Master" -o "$1" = "spark.deploy.worker.Worker" ]; then SPARK_MEM=${SPARK_DAEMON_MEMORY:-512m} + # Backup current SPARK_JAVA_OPTS for use in ExecutorRunner.scala + SPARK_NONDAEMON_JAVA_OPTS=$SPARK_JAVA_OPTS SPARK_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS # Empty by default fi @@ -70,6 +72,7 @@ if [ -e $FWDIR/conf/java-opts ] ; then JAVA_OPTS+=" `cat $FWDIR/conf/java-opts`" fi export JAVA_OPTS +# Attention: when changing the way the JAVA_OPTS are assembled, the change must be reflected in ExecutorRunner.scala! CORE_DIR="$FWDIR/core" REPL_DIR="$FWDIR/repl" |