diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-07-28 19:53:31 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2012-07-28 19:53:31 -0700 |
commit | dc8763fcf782f8befdff6ec8ee5cbd701025ec87 (patch) | |
tree | 8bf7900b8e21dd756431532cac9a7e7d27200153 | |
parent | f6f917bd00a1cae5e99f7888e46e3f232959f280 (diff) | |
download | spark-dc8763fcf782f8befdff6ec8ee5cbd701025ec87.tar.gz spark-dc8763fcf782f8befdff6ec8ee5cbd701025ec87.tar.bz2 spark-dc8763fcf782f8befdff6ec8ee5cbd701025ec87.zip |
Fixed SPARK_MEM not being passed when runner is java
-rwxr-xr-x | run | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -78,6 +78,7 @@ export CLASSPATH # Needed for spark-shell # when we exit, so we allow it to set a variable to launch with scala. if [ "$SPARK_LAUNCH_WITH_SCALA" == "1" ]; then RUNNER="${SCALA_HOME}/bin/scala" + EXTRA_ARGS="" # Java options will be passed to scala as JAVA_OPTS else CLASSPATH+=":$SCALA_HOME/lib/scala-library.jar" CLASSPATH+=":$SCALA_HOME/lib/scala-compiler.jar" @@ -87,6 +88,8 @@ else else RUNNER=java fi + # The JVM doesn't read JAVA_OPTS by default so we need to pass it in + EXTRA_ARGS="$JAVA_OPTS" fi -exec "$RUNNER" -cp "$CLASSPATH" "$@" +exec "$RUNNER" -cp "$CLASSPATH" $EXTRA_ARGS "$@" |