svn commit: r1131915 - in /incubator/mesos/trunk/bin: deploy-to-slaves mesos-daemon mesos_env.sh start-mesos

[be...@apache.org]

Author: benh
Date: Sun Jun  5 05:50:36 2011
New Revision: 1131915

URL: http://svn.apache.org/viewvc?rev=1131915&view=rev
Log:
Next round of deploy script updates. Inspired by R Cluster deployment.

Modified:
    incubator/mesos/trunk/bin/deploy-to-slaves
    incubator/mesos/trunk/bin/mesos-daemon
    incubator/mesos/trunk/bin/mesos_env.sh
    incubator/mesos/trunk/bin/start-mesos

Modified: incubator/mesos/trunk/bin/deploy-to-slaves
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/deploy-to-slaves?rev=1131915&r1=1131914&r2=1131915&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/deploy-to-slaves (original)
+++ incubator/mesos/trunk/bin/deploy-to-slaves Sun Jun  5 05:50:36 2011
@@ -8,9 +8,9 @@ bin=`cd "$bin"; pwd`
 echo "RSYNC'ing $MESOS_ROOT to slaves..."
 for slave in $SLAVES; do
   echo $slave
-  echo ssh $SSH_OPTS $slave "mkdir -p $mesos_ROOT"
-  ssh $SSH_OPTS $slave "mkdir -p $mesos_ROOT"
-  echo rsync -avz $mesos_ROOT/ $slave:$mesos_ROOT 
-  rsync -avz $mesos_ROOT/ $slave:$mesos_ROOT &
+  echo ssh $SSH_OPTS $slave "mkdir -p $MESOS_ROOT"
+  ssh $SSH_OPTS $slave "mkdir -p $MESOS_ROOT"
+  echo rsync -avz $MESOS_ROOT/ $slave:$MESOS_ROOT
+  rsync -avz $MESOS_ROOT/ $slave:$MESOS_ROOT &
   sleep 0.1
 done

Modified: incubator/mesos/trunk/bin/mesos-daemon
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/mesos-daemon?rev=1131915&r1=1131914&r2=1131915&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/mesos-daemon (original)
+++ incubator/mesos/trunk/bin/mesos-daemon Sun Jun  5 05:50:36 2011
@@ -26,8 +26,8 @@ if [ ! -d $MESOS_LOGS ]; then
   mkdir -p $MESOS_LOGS
 fi
 
-FULL_IP=`hostname --all-ip-addresses`
-IP=`echo $FULL_IP|sed 's/\([^ ]*\) .*/\1/'`
 
 cd $MESOS_HOME
-LIBPROCESS_IP=$IP nohup ./$PROGRAM $EXTRA_OPTS $@ </dev/null >$MESOS_LOGS/$PROGRAM.out 2>&1 &
+echo "now in dir `pwd`"
+echo "LIBPROCESS_IP=`$LIBPROCESS_IP_GETTER` nohup ./$PROGRAM $EXTRA_OPTS $@ </dev/null >$MESOS_LOGS/$PROGRAM.out 2>&1"
+LIBPROCESS_IP=`$LIBPROCESS_IP_GETTER` nohup ./$PROGRAM $EXTRA_OPTS $@ </dev/null  >$MESOS_LOGS/$PROGRAM.out 2>&1 &

Modified: incubator/mesos/trunk/bin/mesos_env.sh
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/mesos_env.sh?rev=1131915&r1=1131914&r2=1131915&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/mesos_env.sh (original)
+++ incubator/mesos/trunk/bin/mesos_env.sh Sun Jun  5 05:50:36 2011
@@ -10,7 +10,9 @@ export PATH=$PATH:/root/scala-2.7.7.fina
 MASTER=`cat $bin/master`
 SLAVES=`cat $bin/slaves`
 
-MASTER_PORT=1111
+MASTER_PORT=9999
+MASTER_WEBUI_PORT=9090
+SLAVE_WEBUI_PORT=9091
 
 #The dir where Mesos deployment scripts live
 MESOS_ROOT=`cd $bin/..;pwd`
@@ -30,3 +32,11 @@ JAVA_HOME=/usr/lib/jvm/java-6-sun
 #options for ssh'ing
 SSH_OPTS="-o stricthostkeychecking=no -o connecttimeout=2"
 
+#LIBPROCESS_IP_GETTER
+
+#LIBPROCESS_IP_GETTER="echo $MASTER"
+
+#LIBPROCESS_IP_GETTER="hostname -i" #works on older versions of hostname, not on osx
+
+#FULL_IP="hostname --all-ip-addresses" # newer versions of hostname only
+#LIBPROCESS_IP_GETTER=`echo $FULL_IP|sed 's/\([^ ]*\) .*/\1/'`

Modified: incubator/mesos/trunk/bin/start-mesos
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/start-mesos?rev=1131915&r1=1131914&r2=1131915&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/start-mesos (original)
+++ incubator/mesos/trunk/bin/start-mesos Sun Jun  5 05:50:36 2011
@@ -6,15 +6,45 @@ bin=`cd "$bin"; pwd`
 
 cd $bin
 
+DEFAULT_MASTER_WEBUI_PORT=5555  #Globals
+DEFAULT_SLAVE_WEBUI_PORT=5051
+
+if [ ! $MASTER_PORT ]; then
+  MASTER_PORT=$DEFAULT_MASTER_PORT
+fi
+
+###########################
+#Launch master
+
+if [ ! $MASTER_WEBUI_PORT ]; then
+  MASTER_WEBUI_PORT=$DEFAULT_MASTER_WEBUI_PORT
+fi
+
+MASTER_FLAGS=" -p $MASTER_PORT"
+MASTER_FLAGS+=" -w $MASTER_WEBUI_PORT"
+
 echo "Starting master on $MASTER"
-ssh $SSH_OPTS $MASTER "$bin/mesos-daemon mesos-master -p $MASTER_PORT </dev/null >/dev/null"
+echo ssh $SSH_OPTS $MASTER "$bin/mesos-daemon mesos-master $MASTER_FLAGS </dev/null >/dev/null"
+ssh $SSH_OPTS $MASTER "$bin/mesos-daemon mesos-master $MASTER_FLAGS </dev/null >/dev/null"
+
+###########################
+#Launch slaves
+
+SLAVE_FLAGS="-u 1@$MASTER:$MASTER_PORT"
+if [ $SLAVE_WEBUI_PORT ]; then
+  SLAVE_FLAGS+=" -w $SLAVE_WEBUI_PORT"
+else
+  SLAVE_FLAGS+=" -w $DEFAULT_SLAVE_WEBUI_PORT"
+fi
 
 for slave in $SLAVES; do
   echo "Starting slave on $slave"
-  ssh $SSH_OPTS $slave "$bin/mesos-daemon mesos-slave -u 1@$MASTER:$MASTER_PORT </dev/null >/dev/null" &
+  echo ssh $SSH_OPTS $slave "$bin/mesos-daemon mesos-slave $SLAVE_FLAGS </dev/null >/dev/null" &
+  ssh $SSH_OPTS $slave "$bin/mesos-daemon mesos-slave $SLAVE_FLAGS </dev/null >/dev/null" &
   sleep 0.1
 done
 wait
 
 echo "Everything's started! You can view the master Web UI at"
-echo "      http://$MASTER:8080"
+
+echo "      http://$MASTER:$MASTER_WEBUI_PORT"