You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 05:30:49 UTC
svn commit: r1131620 - in /incubator/mesos/trunk/src/ec2:
deploy.karmic64/root/nexus-ec2/ deploy.solaris/root/nexus-ec2/
Author: benh
Date: Sun Jun 5 03:30:48 2011
New Revision: 1131620
URL: http://svn.apache.org/viewvc?rev=1131620&view=rev
Log:
Benh's commits from his benh branch which enable running multiple slaves on the same ec2 machines moved to this branch
Modified:
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus
incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus
Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/nexus-daemon Sun Jun 5 03:30:48 2011
@@ -22,12 +22,22 @@ shift
EXTRA_OPTS=""
if [ "$PROGRAM" == "nexus-slave" ]; then
- # Compute CPU and memory resources on this machine (TODO: Solaris-specific)
- 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"
+ # Compute CPU resources (if not specified).
+ if [[ "$*" != *--cpus* ]]; then
+ CPUS=`grep processor /proc/cpuinfo | wc -l`
+ EXTRA_OPTS="$EXTRA_OPTS --cpus $CPUS"
+ fi
+
+ # Compute memory resources (if not specified).
+ if [[ "$*" != *--mem* ]]; then
+ MEM_KB=`cat /proc/meminfo | grep MemTotal | awk '{print $2}'`
+ MEM=$[(MEM_KB - 1024 * 1024) * 1024]
+ EXTRA_OPTS="$EXTRA_OPTS --mem $MEM"
+ fi
fi
+# Set file descriptor limit (expecting to be root).
+ulimit -n 65536
+
cd $NEXUS_HOME/src
nohup ./$PROGRAM $EXTRA_OPTS $@ </dev/null >/mnt/$PROGRAM.out 2>&1 &
Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/start-nexus Sun Jun 5 03:30:48 2011
@@ -9,9 +9,36 @@ SSH_OPTS="-o StrictHostKeyChecking=no -o
echo "Starting master on $MASTER"
ssh $SSH_OPTS $MASTER "/root/nexus-ec2/nexus-daemon nexus-master -p 1111 </dev/null >/dev/null"
+COUNT=''
+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 "/root/nexus-ec2/nexus-daemon nexus-slave 1@$MASTER:1111 </dev/null >/dev/null" &
+ echo "Starting $COUNT slave(s) on $slave"
+ ssh $SSH_OPTS $slave "for ((i = 0; i < $COUNT; i++)); do /root/nexus-ec2/nexus-daemon nexus-slave 1@$MASTER:1111 $CPUS $MEM; done </dev/null >/dev/null" &
sleep 0.1
done
wait
Modified: incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus (original)
+++ incubator/mesos/trunk/src/ec2/deploy.karmic64/root/nexus-ec2/stop-nexus Sun Jun 5 03:30:48 2011
@@ -7,7 +7,7 @@ SLAVES="`cat slaves`"
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
for slave in $SLAVES; do
- echo "Stopping slave on $slave"
+ echo "Stopping slave(s) on $slave"
ssh $SSH_OPTS $slave pkill nexus-slave &
sleep 0.1
done
Modified: incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon (original)
+++ incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/nexus-daemon Sun Jun 5 03:30:48 2011
@@ -22,11 +22,18 @@ shift
EXTRA_OPTS=""
if [ "$PROGRAM" == "nexus-slave" ]; then
- # Compute CPU and memory resources on this machine (TODO: Solaris-specific)
- CPUS=`psrinfo | wc -l`
- MEM=$(((`/usr/sbin/prtconf | grep Memory | awk '{ print $3 }'` - 1000) *
- 1024 * 1024))
- EXTRA_OPTS="--cpus $CPUS --mem $MEM"
+ # Compute CPU resources (if not specified).
+ if [[ "$*" != *--cpus* ]]; then
+ CPUS=`psrinfo | wc -l`
+ EXTRA_OPTS="$EXTRA_OPTS --cpus $CPUS"
+ fi
+
+ # Compute memory resources (if not specified).
+ if [[ "$*" != *--mem* ]]; then
+ MEM_KB=`/usr/sbin/prtconf | grep Memory | awk '{ print $3 }'`
+ MEM=$(((MEM_KB - 1000) * 1024 * 1024))
+ EXTRA_OPTS="$EXTRA_OPTS --mem $MEM"
+ fi
fi
cd $NEXUS_HOME/src
Modified: incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus (original)
+++ incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/start-nexus Sun Jun 5 03:30:48 2011
@@ -9,9 +9,36 @@ SSH_OPTS="-o StrictHostKeyChecking=no -o
echo "Starting master on $MASTER"
ssh $SSH_OPTS $MASTER "/root/nexus-ec2/nexus-daemon nexus-master -p 1111 </dev/null >/dev/null"
+COUNT=''
+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 "/root/nexus-ec2/nexus-daemon nexus-slave 1@$MASTER:1111 </dev/null >/dev/null" &
+ echo "Starting $COUNT slave(s) on $slave"
+ ssh $SSH_OPTS $slave "for ((i = 0; i < $COUNT; i++)); do /root/nexus-ec2/nexus-daemon nexus-slave 1@$MASTER:1111 $CPUS $MEM; done </dev/null >/dev/null" &
sleep 0.1
done
wait
Modified: incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus?rev=1131620&r1=1131619&r2=1131620&view=diff
==============================================================================
--- incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus (original)
+++ incubator/mesos/trunk/src/ec2/deploy.solaris/root/nexus-ec2/stop-nexus Sun Jun 5 03:30:48 2011
@@ -7,7 +7,7 @@ SLAVES="`cat slaves`"
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
for slave in $SLAVES; do
- echo "Stopping slave on $slave"
+ echo "Stopping slave(s) on $slave"
ssh $SSH_OPTS $slave pkill nexus-slave &
sleep 0.1
done