From ce915cadee1de8e265f090b7be2f6e70d1b4062e Mon Sep 17 00:00:00 2001
From: root <root@ip-10-226-118-223.ec2.internal>
Date: Sun, 7 Oct 2012 04:19:16 +0000
Subject: [PATCH] Made run script add test-classes onto the classpath only if
SPARK_TESTING is set; fixes #216
---
.../scheduler/cluster/SparkDeploySchedulerBackend.scala | 3 ++-
.../spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala | 3 ++-
.../scala/spark/scheduler/mesos/MesosSchedulerBackend.scala | 3 ++-
run | 6 ++++--
sbt/sbt | 1 +
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
index 0043dbeb10..88cb114544 100644
--- a/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/cluster/SparkDeploySchedulerBackend.scala
@@ -25,7 +25,8 @@ private[spark] class SparkDeploySchedulerBackend(
"SPARK_MEM",
"SPARK_CLASSPATH",
"SPARK_LIBRARY_PATH",
- "SPARK_JAVA_OPTS"
+ "SPARK_JAVA_OPTS",
+ "SPARK_TESTING"
)
// Memory used by each executor (in megabytes)
diff --git a/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
index 9737c6b63e..e6d8b9d822 100644
--- a/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/mesos/CoarseMesosSchedulerBackend.scala
@@ -38,7 +38,8 @@ private[spark] class CoarseMesosSchedulerBackend(
"SPARK_MEM",
"SPARK_CLASSPATH",
"SPARK_LIBRARY_PATH",
- "SPARK_JAVA_OPTS"
+ "SPARK_JAVA_OPTS",
+ "SPARK_TESTING"
)
val MAX_SLAVE_FAILURES = 2 // Blacklist a slave after this many failures
diff --git a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
index e85e4ef318..6f01c8c09d 100644
--- a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
+++ b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala
@@ -34,7 +34,8 @@ private[spark] class MesosSchedulerBackend(
"SPARK_MEM",
"SPARK_CLASSPATH",
"SPARK_LIBRARY_PATH",
- "SPARK_JAVA_OPTS"
+ "SPARK_JAVA_OPTS",
+ "SPARK_TESTING"
)
// Memory used by each executor (in megabytes)
diff --git a/run b/run
index 6cab4765ee..cb1499c6f9 100755
--- a/run
+++ b/run
@@ -21,7 +21,7 @@ fi
# If the user specifies a Mesos JAR, put it before our included one on the classpath
MESOS_CLASSPATH=""
-if [ -z "$MESOS_JAR" ] ; then
+if [ -n "$MESOS_JAR" ] ; then
MESOS_CLASSPATH="$MESOS_JAR"
fi
@@ -52,7 +52,9 @@ CLASSPATH="$SPARK_CLASSPATH"
CLASSPATH+=":$MESOS_CLASSPATH"
CLASSPATH+=":$FWDIR/conf"
CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/classes"
-CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/test-classes"
+if [ -n "$SPARK_TESTING" ] ; then
+ CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/test-classes"
+fi
CLASSPATH+=":$CORE_DIR/src/main/resources"
CLASSPATH+=":$REPL_DIR/target/scala-$SCALA_VERSION/classes"
CLASSPATH+=":$EXAMPLES_DIR/target/scala-$SCALA_VERSION/classes"
diff --git a/sbt/sbt b/sbt/sbt
index fab9967286..a3055c13c1 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -4,4 +4,5 @@ if [ "$MESOS_HOME" != "" ]; then
EXTRA_ARGS="-Djava.library.path=$MESOS_HOME/lib/java"
fi
export SPARK_HOME=$(cd "$(dirname $0)/.."; pwd)
+export SPARK_TESTING=1 # To put test classes on classpath
java -Xmx1200M -XX:MaxPermSize=200m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@"
--
GitLab