svn commit: r1131914 - 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:29 2011
New Revision: 1131914

URL: http://svn.apache.org/viewvc?rev=1131914&view=rev
Log:
Minor bug fixes and updates to deploy scripts.

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=1131914&r1=1131913&r2=1131914&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/deploy-to-slaves (original)
+++ incubator/mesos/trunk/bin/deploy-to-slaves Sun Jun  5 05:50:29 2011
@@ -5,7 +5,7 @@ bin=`cd "$bin"; pwd`
 
 . $bin/mesos_env.sh
 
-echo "RSYNC'ing $mesos_ROOT to slaves..."
+echo "RSYNC'ing $MESOS_ROOT to slaves..."
 for slave in $SLAVES; do
   echo $slave
   echo ssh $SSH_OPTS $slave "mkdir -p $mesos_ROOT"
@@ -13,5 +13,4 @@ for slave in $SLAVES; do
   echo rsync -avz $mesos_ROOT/ $slave:$mesos_ROOT 
   rsync -avz $mesos_ROOT/ $slave:$mesos_ROOT &
   sleep 0.1
-  #scp ~/.ssh/id_rsa $slave:.ssh
 done

Modified: incubator/mesos/trunk/bin/mesos-daemon
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/mesos-daemon?rev=1131914&r1=1131913&r2=1131914&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/mesos-daemon (original)
+++ incubator/mesos/trunk/bin/mesos-daemon Sun Jun  5 05:50:29 2011
@@ -5,9 +5,6 @@ bin=`cd "$bin"; pwd`
 
 . $bin/mesos_env.sh
 
-# Set MESOS_PUBLIC_DNS so slaves can be linked in master web UI
-#export MESOS_PUBLIC_DNS=`wget -q -O - http://instance-data.ec2.internal/latest/meta-data/public-hostname`
-
 #ulimit -n 8192
 #export LD_PRELOAD_32=/usr/lib/extendedFILE.so.1
 
@@ -21,7 +18,7 @@ if [ "$PROGRAM" == "mesos-slave" ]; then
   CPUS=`grep processor /proc/cpuinfo | wc -l`
   MEM_KB=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
   MEM=$[(MEM_KB - 1024 * 1024) * 1024]
-  EXTRA_OPTS="--cpus $CPUS --mem $MEM"
+  EXTRA_OPTS="--cpus=$CPUS --mem=$MEM"
 fi
 
 
@@ -29,6 +26,8 @@ if [ ! -d $MESOS_LOGS ]; then
   mkdir -p $MESOS_LOGS
 fi
 
-echo cd $MESOS_HOME
+FULL_IP=`hostname --all-ip-addresses`
+IP=`echo $FULL_IP|sed 's/\([^ ]*\) .*/\1/'`
+
 cd $MESOS_HOME
-nohup ./$PROGRAM $EXTRA_OPTS $@ </dev/null >$MESOS_LOGS/$PROGRAM.out 2>&1 &
+LIBPROCESS_IP=$IP 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=1131914&r1=1131913&r2=1131914&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/mesos_env.sh (original)
+++ incubator/mesos/trunk/bin/mesos_env.sh Sun Jun  5 05:50:29 2011
@@ -10,6 +10,8 @@ export PATH=$PATH:/root/scala-2.7.7.fina
 MASTER=`cat $bin/master`
 SLAVES=`cat $bin/slaves`
 
+MASTER_PORT=1111
+
 #The dir where Mesos deployment scripts live
 MESOS_ROOT=`cd $bin/..;pwd`
 echo "MESOS_ROOT is $MESOS_ROOT"

Modified: incubator/mesos/trunk/bin/start-mesos
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/bin/start-mesos?rev=1131914&r1=1131913&r2=1131914&view=diff
==============================================================================
--- incubator/mesos/trunk/bin/start-mesos (original)
+++ incubator/mesos/trunk/bin/start-mesos Sun Jun  5 05:50:29 2011
@@ -6,12 +6,12 @@ bin=`cd "$bin"; pwd`
 
 cd $bin
 
-#echo "Starting master on $MASTER"
-#ssh $SSH_OPTS $MASTER "$bin/mesos-daemon mesos-master -p 1111 </dev/null >/dev/null"
+echo "Starting master on $MASTER"
+ssh $SSH_OPTS $MASTER "$bin/mesos-daemon mesos-master -p $MASTER_PORT </dev/null >/dev/null"
 
 for slave in $SLAVES; do
   echo "Starting slave on $slave"
-  ssh $SSH_OPTS $slave "$bin/mesos-daemon mesos-slave -u 1@$MASTER:1111 </dev/null >/dev/null" &
+  ssh $SSH_OPTS $slave "$bin/mesos-daemon mesos-slave -u 1@$MASTER:$MASTER_PORT </dev/null >/dev/null" &
   sleep 0.1
 done
 wait