diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-15 19:42:26 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-10-15 19:42:26 -0700 |
commit | 6c1dee2e42587e5722bdec86bd102c120e2e1dee (patch) | |
tree | 31f0dd2a472119dd5895d90222bd34512f0ab782 /run | |
parent | ecb1af576e5e0be9f67cf0375f998d1fa7ac3a07 (diff) | |
download | spark-6c1dee2e42587e5722bdec86bd102c120e2e1dee.tar.gz spark-6c1dee2e42587e5722bdec86bd102c120e2e1dee.tar.bz2 spark-6c1dee2e42587e5722bdec86bd102c120e2e1dee.zip |
Added code so that Spark jobs can be launched from outside the Spark
directory by setting SPARK_HOME and locating the executor relative to
that. Entries on SPARK_CLASSPATH and SPARK_LIBRARY_PATH are also passed
along to worker nodes.
Diffstat (limited to 'run')
-rwxr-xr-x | run | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -3,14 +3,20 @@ # Figure out where the Scala framework is installed FWDIR=`dirname $0` +# Export this as SPARK_HOME +export SPARK_HOME="$FWDIR" + # Load environment variables from conf/spark-env.sh, if it exists if [ -e $FWDIR/conf/spark-env.sh ] ; then . $FWDIR/conf/spark-env.sh fi +MESOS_CLASSPATH="" +MESOS_LIBRARY_PATH="" + if [ "x$MESOS_HOME" != "x" ] ; then - SPARK_CLASSPATH="$MESOS_HOME/lib/java/mesos.jar:$SPARK_CLASSPATH" - SPARK_LIBRARY_PATH="$MESOS_HOME/lib/java:$SPARK_LIBARY_PATH" + MESOS_CLASSPATH="$MESOS_HOME/lib/java/mesos.jar" + MESOS_LIBRARY_PATH="$MESOS_HOME/lib/java" fi if [ "x$SPARK_MEM" == "x" ] ; then @@ -19,7 +25,7 @@ fi # Set JAVA_OPTS to be able to load native libraries and to set heap size JAVA_OPTS="$SPARK_JAVA_OPTS" -JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/third_party:$FWDIR/src/native" +JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH:$FWDIR/third_party:$FWDIR/src/native:$MESOS_LIBRARY_PATH" JAVA_OPTS+=" -Xms$SPARK_MEM -Xmx$SPARK_MEM" # Load extra JAVA_OPTS from conf/java-opts, if it exists if [ -e $FWDIR/conf/java-opts ] ; then @@ -28,7 +34,7 @@ fi export JAVA_OPTS # Build up classpath -CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes" +CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes:$MESOS_CLASSPATH" CLASSPATH+=:$FWDIR/conf CLASSPATH+=:$FWDIR/third_party/mesos.jar CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar |