Merge pull request #287 from rxin/startslave

Use SPARK_MASTER_IP if it is set in start-slaves.sh.

bin/start-slaves.sh

@@ -14,7 +14,21 @@ if [ "$SPARK_MASTER_PORT" = "" ]; then
   SPARK_MASTER_PORT=7077
 fi
 
-hostname=`hostname`
-ip=`host "$hostname" | cut -d " " -f 4`
+if [ "$SPARK_MASTER_IP" = "" ]; then
+  hostname=`hostname`
+  hostouput=`host "$hostname"`
+
+  if [[ "$hostouput" == *"not found"* ]]; then
+    echo $hostouput
+    echo "Fail to identiy the IP for the master."
+    echo "Set SPARK_MASTER_IP explicitly in configuration instead."
+    exit 1
+  fi
+  ip=`host "$hostname" | cut -d " " -f 4`
+else
+  ip=$SPARK_MASTER_IP
+fi
+
+echo "Master IP: $ip"
 
 "$bin"/spark-daemons.sh start spark.deploy.worker.Worker spark://$ip:$SPARK_MASTER_PORT
\ No newline at end of file