diff options
| author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
|---|---|---|
| committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
| commit | dd515ca3ee011cbf9b6941bb45afc55fd905fda8 (patch) | |
| tree | 284b4c31d0d7c8c06b4f78125ddb50037ee50630 /bin/spark-daemon.sh | |
| parent | adcda84f9646f12e6d5fb4f1e5e3a1b0a98b7c9f (diff) | |
| parent | 17e076de800ea0d4c55f2bd657348641f6f9c55b (diff) | |
| download | spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.gz spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.bz2 spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.zip | |
Attempt at fixing merge conflict
Diffstat (limited to 'bin/spark-daemon.sh')
| -rwxr-xr-x | bin/spark-daemon.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/spark-daemon.sh b/bin/spark-daemon.sh index 0c584055c7..8ee3ec481f 100755 --- a/bin/spark-daemon.sh +++ b/bin/spark-daemon.sh @@ -30,7 +30,7 @@ # SPARK_NICENESS The scheduling priority for daemons. Defaults to 0. ## -usage="Usage: spark-daemon.sh [--config <conf-dir>] [--hosts hostlistfile] (start|stop) <spark-command> <args...>" +usage="Usage: spark-daemon.sh [--config <conf-dir>] [--hosts hostlistfile] (start|stop) <spark-command> <spark-instance-number> <args...>" # if no args specified, show usage if [ $# -le 1 ]; then @@ -48,6 +48,8 @@ startStop=$1 shift command=$1 shift +instance=$1 +shift spark_rotate_log () { @@ -92,10 +94,10 @@ if [ "$SPARK_PID_DIR" = "" ]; then fi # some variables -export SPARK_LOGFILE=spark-$SPARK_IDENT_STRING-$command-$HOSTNAME.log +export SPARK_LOGFILE=spark-$SPARK_IDENT_STRING-$command-$instance-$HOSTNAME.log export SPARK_ROOT_LOGGER="INFO,DRFA" -log=$SPARK_LOG_DIR/spark-$SPARK_IDENT_STRING-$command-$HOSTNAME.out -pid=$SPARK_PID_DIR/spark-$SPARK_IDENT_STRING-$command.pid +log=$SPARK_LOG_DIR/spark-$SPARK_IDENT_STRING-$command-$instance-$HOSTNAME.out +pid=$SPARK_PID_DIR/spark-$SPARK_IDENT_STRING-$command-$instance.pid # Set default scheduling priority if [ "$SPARK_NICENESS" = "" ]; then |