diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-09-28 23:22:07 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2010-09-28 23:54:29 -0700 |
commit | 7090dea44bf9cc671bceb4b3dbee4ac3670c26b2 (patch) | |
tree | ebaad2c323b7197cc1094f1a0b7820540e9f2700 /run | |
parent | 516248aa66752e55f83d37c8fd3382975e05f700 (diff) | |
download | spark-7090dea44bf9cc671bceb4b3dbee4ac3670c26b2.tar.gz spark-7090dea44bf9cc671bceb4b3dbee4ac3670c26b2.tar.bz2 spark-7090dea44bf9cc671bceb4b3dbee4ac3670c26b2.zip |
Changed printlns to log statements and fixed a bug in run that was causing it to fail on a Mesos cluster
Diffstat (limited to 'run')
-rwxr-xr-x | run | 35 |
1 files changed, 17 insertions, 18 deletions
@@ -28,25 +28,24 @@ fi export JAVA_OPTS # Build up classpath -SPARK_CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes" -SPARK_CLASSPATH+=:$FWDIR/conf -SPARK_CLASSPATH+=:$FWDIR/third_party/mesos.jar -SPARK_CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar -SPARK_CLASSPATH+=:$FWDIR/third_party/colt.jar -SPARK_CLASSPATH+=:$FWDIR/third_party/guava-r06/guava-r06.jar -SPARK_CLASSPATH+=:$FWDIR/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar -SPARK_CLASSPATH+=:third_party/scalatest-1.2/scalatest-1.2.jar -SPARK_CLASSPATH+=:third_party/scalacheck_2.8.0-1.7.jar -SPARK_CLASSPATH+=:third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar -SPARK_CLASSPATH+=:third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar -SPARK_CLASSPATH+=:third_party/apache-log4j-1.2.16/log4j-1.2.16.jar -SPARK_CLASSPATH+=:third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar -SPARK_CLASSPATH+=:third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar +CLASSPATH="$SPARK_CLASSPATH:$FWDIR/build/classes" +CLASSPATH+=:$FWDIR/conf +CLASSPATH+=:$FWDIR/third_party/mesos.jar +CLASSPATH+=:$FWDIR/third_party/asm-3.2/lib/all/asm-all-3.2.jar +CLASSPATH+=:$FWDIR/third_party/colt.jar +CLASSPATH+=:$FWDIR/third_party/guava-r06/guava-r06.jar +CLASSPATH+=:$FWDIR/third_party/hadoop-0.20.0/hadoop-0.20.0-core.jar +CLASSPATH+=:$FWDIR/third_party/scalatest-1.2/scalatest-1.2.jar +CLASSPATH+=:$FWDIR/third_party/scalacheck_2.8.0-1.7.jar +CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/jetty-server-7.1.6.v20100715.jar +CLASSPATH+=:$FWDIR/third_party/jetty-7.1.6.v20100715/servlet-api-2.5.jar +CLASSPATH+=:$FWDIR/third_party/apache-log4j-1.2.16/log4j-1.2.16.jar +CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-api-1.6.1.jar +CLASSPATH+=:$FWDIR/third_party/slf4j-1.6.1/slf4j-log4j12-1.6.1.jar for jar in $FWDIR/third_party/hadoop-0.20.0/lib/*.jar; do - SPARK_CLASSPATH+=:$jar + CLASSPATH+=:$jar done -export SPARK_CLASSPATH -export CLASSPATH=$SPARK_CLASSPATH # Needed for spark-shell +export CLASSPATH # Needed for spark-shell if [ -n "$SCALA_HOME" ]; then SCALA=${SCALA_HOME}/bin/scala @@ -54,4 +53,4 @@ else SCALA=scala fi -exec $SCALA -cp $SPARK_CLASSPATH $@ +exec $SCALA -cp $CLASSPATH $@ |