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/slaves.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/slaves.sh')
| -rwxr-xr-x | bin/slaves.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/bin/slaves.sh b/bin/slaves.sh index 752565b759..c367c2fd8e 100755 --- a/bin/slaves.sh +++ b/bin/slaves.sh @@ -28,7 +28,7 @@ # SPARK_SSH_OPTS Options passed to ssh when running remote commands. ## -usage="Usage: slaves.sh [--config confdir] command..." +usage="Usage: slaves.sh [--config <conf-dir>] command..." # if no args specified, show usage if [ $# -le 0 ]; then @@ -46,6 +46,23 @@ bin=`cd "$bin"; pwd` # spark-env.sh. Save it here. HOSTLIST=$SPARK_SLAVES +# 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 + if [ -f "${SPARK_CONF_DIR}/spark-env.sh" ]; then . "${SPARK_CONF_DIR}/spark-env.sh" fi |