From d2c86e718891b40e1cea8b0719462673b6b64e4e Mon Sep 17 00:00:00 2001
From: KarthikTunga <karthik.tunga@gmail.com>
Date: Tue, 15 Oct 2013 00:35:44 -0700
Subject: [PATCH] SPARK-627 - reading --config argument
---
bin/slaves.sh | 16 ++++++++++++++++
bin/spark-daemon.sh | 17 +++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/bin/slaves.sh b/bin/slaves.sh
index 752565b759..bcb7760130 100755
--- a/bin/slaves.sh
+++ b/bin/slaves.sh
@@ -46,6 +46,22 @@ bin=`cd "$bin"; pwd`
# spark-env.sh. Save it here.
HOSTLIST=$SPARK_SLAVES
+#check if conf dir passed as an argument
+if [ "$1" == "--config" ]
+then
+ shift
+ conf_dir=$1
+ if [ ! -d "$conf_dir" ]
+ then
+ echo "$conf_dir is not a valid 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
diff --git a/bin/spark-daemon.sh b/bin/spark-daemon.sh
index 5bfe967fbf..48d552f3db 100755
--- a/bin/spark-daemon.sh
+++ b/bin/spark-daemon.sh
@@ -43,6 +43,23 @@ bin=`cd "$bin"; pwd`
. "$bin/spark-config.sh"
# get arguments
+
+# check if conf dir passed as an argument
+if [ "$1" == "--config" ]
+then
+ shift
+ conf_dir=$1
+ if [ ! -d "$conf_dir" ]
+ then
+ echo "$conf_dir is not a valid directory"
+ echo "FOUL :"$usage
+ exit 1
+ else
+ export SPARK_CONF_DIR=$conf_dir
+ fi
+ shift
+fi
+
startStop=$1
shift
command=$1
--
GitLab