Only try tachyon operations if tachyon script exists

pdeyhim · Mar 18, 2014 · 111e8e1 · 111e8e1
1 parent 0561574
commit 111e8e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/sbin/start-master.sh b/sbin/start-master.sh
@@ -27,6 +27,10 @@ START_TACHYON=false
 while (( "$#" )); do
 case $1 in
     --with-tachyon)
+      if [ ! -e "$sbin"/tachyon/bin/tachyon ]; then
+        echo "Error: --with-tachyon specified, but tachyon not found."
+        exit -1
+      fi
       START_TACHYON=true
       ;;
   esac

diff --git a/sbin/stop-slaves.sh b/sbin/stop-slaves.sh
@@ -27,7 +27,9 @@ if [ -f "${SPARK_CONF_DIR}/spark-env.sh" ]; then
 fi
 
 # do before the below calls as they exec
-"$sbin/slaves.sh" cd "$SPARK_HOME" \; "$sbin"/tachyon/bin/tachyon killAll tachyon.worker.Worker
+if [ -e "$sbin"/tachyon/bin/tachyon ]; then
+  "$sbin/slaves.sh" cd "$SPARK_HOME" \; "$sbin"/tachyon/bin/tachyon killAll tachyon.worker.Worker
+fi
 
 if [ "$SPARK_WORKER_INSTANCES" = "" ]; then
   "$sbin"/spark-daemons.sh stop org.apache.spark.deploy.worker.Worker 1