svn commit: r1132097 - in /incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2: start-mesos stop-mesos

[be...@apache.org]

Author: benh
Date: Sun Jun  5 08:40:50 2011
New Revision: 1132097

URL: http://svn.apache.org/viewvc?rev=1132097&view=rev
Log:
Various fixes

Modified:
    incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/start-mesos
    incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos

Modified: incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/start-mesos
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/start-mesos?rev=1132097&r1=1132096&r2=1132097&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/start-mesos (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/start-mesos Sun Jun  5 08:40:50 2011
@@ -13,7 +13,7 @@ else
   NUM_ZOOS=`cat zoo | wc -l`
 fi
 
-SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
+SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=5"
 
 cluster_url=`cat cluster-url`
 
@@ -23,7 +23,7 @@ if [[ $NUM_ZOOS != 0 ]]; then
   masterid=1
   for master in $MASTERS; do
     echo "Starting master $masterid on $master"
-    ssh $SSH_OPTS $master "/root/mesos-ec2/mesos-daemon mesos-master -p 5050 -u $cluster_url $@ </dev/null >/dev/null" & sleep 0.1
+    ssh $SSH_OPTS $master "/root/mesos-ec2/mesos-daemon mesos-master -p 5050 -u $cluster_url $@ </dev/null >/dev/null" & sleep 0.3
     masterid=$(($masterid+1))
   done
   wait
@@ -34,37 +34,10 @@ fi
 
 sleep 2
 
-COUNT='1'
-CPUS=''
-MEM=''
-
-#read -t 5 -p "If you would like to launch more than one slave per machine, please hit enter/return within the next 5 seconds."
-#
-#if [[ "$?" == "0" ]]; then
-#  while [[ "$COUNT" == '' ]] ; do
-#    read -p "Please specify the number of slaves per machine: " COUNT
-#  done
-#
-#  while [[ "$CPUS" == '' ]] ; do
-#    read -p "Please specify the number of cpus per slave: " CPUS
-#  done
-#
-#  CPUS="--cpus=$CPUS"
-#
-#  while [[ "$MEM" == '' ]] ; do
-#    read -p "Please specify the amount of memory per slave: " MEM
-#  done
-#
-#  MEM="--mem=$MEM"
-#else
-#  COUNT='1'
-#  echo
-#fi
-
 for slave in $SLAVES; do
   echo "Starting slave on $slave"
-  ssh $SSH_OPTS $slave "for ((i = 0; i < $COUNT; i++)); do /root/mesos-ec2/mesos-daemon mesos-slave -u ${cluster_url} $CPUS $MEM; done </dev/null >/dev/null" &
-  sleep 0.1
+  ssh $SSH_OPTS $slave "/root/mesos-ec2/mesos-daemon mesos-slave -u ${cluster_url} </dev/null >/dev/null" &
+  sleep 0.3
 done
 wait
 

Modified: incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos?rev=1132097&r1=1132096&r2=1132097&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/stop-mesos Sun Jun  5 08:40:50 2011
@@ -4,7 +4,7 @@ cd /root/mesos-ec2
 MASTERS=`cat masters`
 SLAVES=`cat slaves`
 
-SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
+SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=5"
 
 for slave in $SLAVES; do
   echo "Stopping slave on $slave"