diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2013-11-12 15:14:21 +0800 |
|---|---|---|
| committer | Raymond Liu <raymond.liu@intel.com> | 2013-11-13 16:55:11 +0800 |
| commit | 0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16 (patch) | |
| tree | 60f01110b170ff72347e1ae6209f898712578ed3 /bin/spark-daemon.sh | |
| parent | 5429d62dfa16305eb23d67dfe38172803c80db65 (diff) | |
| parent | 3d4ad84b63e440fd3f4b3edb1b120ff7c14a42d1 (diff) | |
| download | spark-0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16.tar.gz spark-0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16.tar.bz2 spark-0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16.zip | |
Merge branch 'master' into scala-2.10
Diffstat (limited to 'bin/spark-daemon.sh')
| -rwxr-xr-x | bin/spark-daemon.sh | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/bin/spark-daemon.sh b/bin/spark-daemon.sh index 5bfe967fbf..a0c0d44b58 100755 --- a/bin/spark-daemon.sh +++ b/bin/spark-daemon.sh @@ -29,7 +29,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> <spark-instance-number> <args...>" +usage="Usage: spark-daemon.sh [--config <conf-dir>] (start|stop) <spark-command> <spark-instance-number> <args...>" # if no args specified, show usage if [ $# -le 1 ]; then @@ -43,6 +43,25 @@ bin=`cd "$bin"; pwd` . "$bin/spark-config.sh" # get arguments + +# Check if --config is passed as an argument. It is an optional parameter. +# Exit if the argument is not a directory. + +if [ "$1" == "--config" ] +then + shift + conf_dir=$1 + if [ ! -d "$conf_dir" ] + then + echo "ERROR : $conf_dir is not a directory" + echo $usage + exit 1 + else + export SPARK_CONF_DIR=$conf_dir + fi + shift +fi + startStop=$1 shift command=$1 |