aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatei Zaharia <matei@eecs.berkeley.edu>2013-04-08 09:44:30 -0700
committerMatei Zaharia <matei@eecs.berkeley.edu>2013-04-08 09:44:30 -0700
commiteed54a25d8124865608bf0c2bc8a1dc27958761c (patch)
tree0cfb19b2cd1c0225d75fd43d5a0189d12d6c8b15
parent65caa8f711d8e8b7cf77255d0ca42163f07f426e (diff)
parentb496decf0a486a31afe3cac706a6b80d075cd327 (diff)
downloadspark-eed54a25d8124865608bf0c2bc8a1dc27958761c.tar.gz
spark-eed54a25d8124865608bf0c2bc8a1dc27958761c.tar.bz2
spark-eed54a25d8124865608bf0c2bc8a1dc27958761c.zip
Merge pull request #553 from pwendell/akka-standalone
SPARK-724 - Have Akka logging enabled by default for standalone daemons
-rwxr-xr-xrun1
-rw-r--r--run2.cmd1
2 files changed, 2 insertions, 0 deletions
diff --git a/run b/run
index ca25003708..73239097b9 100755
--- a/run
+++ b/run
@@ -22,6 +22,7 @@ fi
# values for that; it doesn't need a lot
if [ "$1" = "spark.deploy.master.Master" -o "$1" = "spark.deploy.worker.Worker" ]; then
SPARK_MEM=${SPARK_DAEMON_MEMORY:-512m}
+ SPARK_DAEMON_JAVA_OPTS+=" -Dspark.akka.logLifecycleEvents=true"
SPARK_JAVA_OPTS=$SPARK_DAEMON_JAVA_OPTS # Empty by default
fi
diff --git a/run2.cmd b/run2.cmd
index e8972690b8..d2d4807971 100644
--- a/run2.cmd
+++ b/run2.cmd
@@ -21,6 +21,7 @@ set RUNNING_DAEMON=0
if "%1"=="spark.deploy.master.Master" set RUNNING_DAEMON=1
if "%1"=="spark.deploy.worker.Worker" set RUNNING_DAEMON=1
if "x%SPARK_DAEMON_MEMORY%" == "x" set SPARK_DAEMON_MEMORY=512m
+set SPARK_DAEMON_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS% -Dspark.akka.logLifecycleEvents=true
if "%RUNNING_DAEMON%"=="1" set SPARK_MEM=%SPARK_DAEMON_MEMORY%
if "%RUNNING_DAEMON%"=="1" set SPARK_JAVA_OPTS=%SPARK_DAEMON_JAVA_OPTS%