From 89a20b83e9aedca3bf9f6623babeb455badf0ee7 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Sat, 31 Aug 2013 16:33:43 -0700
Subject: [PATCH] Delete some code that was added back in a merge and print
less info in spark-daemon
---
bin/spark-daemon.sh | 3 ---
spark-class | 7 -------
2 files changed, 10 deletions(-)
diff --git a/bin/spark-daemon.sh b/bin/spark-daemon.sh
index eac0774669..f01ff84d95 100755
--- a/bin/spark-daemon.sh
+++ b/bin/spark-daemon.sh
@@ -75,8 +75,6 @@ if [ "$SPARK_IDENT_STRING" = "" ]; then
export SPARK_IDENT_STRING="$USER"
fi
-export SPARK_PRINT_LAUNCH_COMMAND="1"
-
# get log directory
if [ "$SPARK_LOG_DIR" = "" ]; then
export SPARK_LOG_DIR="$SPARK_HOME/logs"
@@ -126,7 +124,6 @@ case $startStop in
spark_rotate_log $log
echo starting $command, logging to $log
- echo "Spark Daemon: $command" > $log
cd "$SPARK_PREFIX"
nohup nice -n $SPARK_NICENESS "$SPARK_PREFIX"/spark-class $command "$@" >> "$log" 2>&1 < /dev/null &
echo $! > $pid
diff --git a/spark-class b/spark-class
index 5ef3de9773..d08120477c 100755
--- a/spark-class
+++ b/spark-class
@@ -77,13 +77,6 @@ else
exit 1
fi
fi
-if [[ ! -f "$FWDIR/RELEASE" && -z "$SCALA_LIBRARY_PATH" ]]; then
- if [ -z "$SCALA_HOME" ]; then
- echo "SCALA_HOME is not set" >&2
- exit 1
- fi
- SCALA_LIBRARY_PATH="$SCALA_HOME/lib"
-fi
# Set SPARK_MEM if it isn't already set since we also use it for this process
SPARK_MEM=${SPARK_MEM:-512m}
--
GitLab