aboutsummaryrefslogtreecommitdiff
path: root/spark-class
diff options
context:
space:
mode:
authorAaron Davidson <aaron@databricks.com>2013-10-05 23:07:26 -0700
committerAaron Davidson <aaron@databricks.com>2013-10-05 23:20:31 -0700
commite1190229e13453cdb1e7c28fdf300d1f8dd717c2 (patch)
tree25a210aadb5fc32c9104b9415566d030a94c28d5 /spark-class
parent0f070279e7cd224de48333b572d3080b742a82d7 (diff)
downloadspark-e1190229e13453cdb1e7c28fdf300d1f8dd717c2.tar.gz
spark-e1190229e13453cdb1e7c28fdf300d1f8dd717c2.tar.bz2
spark-e1190229e13453cdb1e7c28fdf300d1f8dd717c2.zip
Add end-to-end test for standalone scheduler fault tolerance
Docker files drawn mostly from Matt Masse. Some updates from Andre Schumacher.
Diffstat (limited to 'spark-class')
-rwxr-xr-xspark-class2
1 files changed, 1 insertions, 1 deletions
diff --git a/spark-class b/spark-class
index e111ef6da7..f678d5e6c3 100755
--- a/spark-class
+++ b/spark-class
@@ -41,7 +41,7 @@ if [ "$1" = "org.apache.spark.deploy.master.Master" -o "$1" = "org.apache.spark.
SPARK_MEM=${SPARK_DAEMON_MEMORY:-512m}
SPARK_DAEMON_JAVA_OPTS="$SPARK_DAEMON_JAVA_OPTS -Dspark.akka.logLifecycleEvents=true"
# Do not overwrite SPARK_JAVA_OPTS environment variable in this script
- OUR_JAVA_OPTS="$SPARK_DAEMON_JAVA_OPTS" # Empty by default
+ OUR_JAVA_OPTS="$SPARK_JAVA_OPTS $SPARK_DAEMON_JAVA_OPTS" # Empty by default
else
OUR_JAVA_OPTS="$SPARK_JAVA_OPTS"
fi