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 10:29:08 UTC
svn commit: r1132048 - in
/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2: copy-dir
redeploy-mesos setup setup-torque start-mesos stop-mesos
Author: benh
Date: Sun Jun 5 08:29:07 2011
New Revision: 1132048
URL: http://svn.apache.org/viewvc?rev=1132048&view=rev
Log:
Cleaning up scripts. Making style consitent.
Modified:
incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/copy-dir
incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos
incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup
incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup-torque
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/copy-dir
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/copy-dir?rev=1132048&r1=1132047&r2=1132048&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/copy-dir (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/copy-dir Sun Jun 5 08:29:07 2011
@@ -9,12 +9,12 @@ DIR=`readlink -f "$1"`
DIR=`echo "$DIR"|sed 's@/$@@'`
DEST=`dirname "$DIR"`
-SLAVES=/root/mesos-ec2/slaves
+SLAVES=`cat slaves`
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
echo "RSYNC'ing $DIR to slaves..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
rsync -e "ssh $SSH_OPTS" -az "$DIR" "$slave:$DEST"
done
Modified: incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos?rev=1132048&r1=1132047&r2=1132048&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/redeploy-mesos Sun Jun 5 08:29:07 2011
@@ -1,22 +1,21 @@
#!/bin/bash
-MASTERS=/root/mesos-ec2/masters
-SLAVES=/root/mesos-ec2/slaves
-
-NUM_MASTERS=`cat $MASTERS | wc -l`
+MASTERS_FILE="masters"
+NUM_MASTERS=`cat $MASTERS_FILE | wc -l`
+SLAVES=`cat slaves`
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
-if [ $NUM_MASTERS -gt 1 ]; then
+if [[ $NUM_MASTERS -gt 1 ]]; then
echo "RSYNC'ing /root/mesos to masters..."
- for master in `cat $MASTERS`; do
- echo $master
- rsync -e "ssh $SSH_OPTS" -az --exclude '*.d' --exclude '*.o' --exclude '*.cpp' --exclude '*.hpp' --exclude '*.pyc' --exclude 'mesos/frameworks/hadoop-0.20.0/logs/*' --exclude 'mesos/work' --exclude 'mesos/logs' --exclude 'mesos/test_output' /root/mesos $master:/root
+ for master `cat $MASTERS_FILE | sed '1d'`; do
+ echo $master
+ rsync -e "ssh $SSH_OPTS" -az --exclude '*.d' --exclude '*.o' --exclude '*.cpp' --exclude '*.hpp' --exclude '*.pyc' --exclude 'mesos/frameworks/hadoop-0.20.0/logs/*' --exclude 'mesos/work' --exclude 'mesos/logs' --exclude 'mesos/test_output' /root/mesos $master:/root
done
fi
echo "RSYNC'ing /root/mesos to slaves..."
-for slave in `cat $SLAVES`; do
- echo $slave
- rsync -e "ssh $SSH_OPTS" -az --exclude '*.d' --exclude '*.o' --exclude '*.cpp' --exclude '*.hpp' --exclude '*.pyc' --exclude 'mesos/frameworks/hadoop-0.20.0/logs/*' --exclude 'mesos/work' --exclude 'mesos/logs' --exclude 'mesos/test_output' /root/mesos $slave:/root
+for slave in $SLAVES; do
+ echo $slave
+ rsync -e "ssh $SSH_OPTS" -az --exclude '*.d' --exclude '*.o' --exclude '*.cpp' --exclude '*.hpp' --exclude '*.pyc' --exclude 'mesos/frameworks/hadoop-0.20.0/logs/*' --exclude 'mesos/work' --exclude 'mesos/logs' --exclude 'mesos/test_output' /root/mesos $slave:/root
done
Modified: incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup?rev=1132048&r1=1132047&r2=1132048&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup Sun Jun 5 08:29:07 2011
@@ -6,14 +6,16 @@ BRANCH=$3
# By exporting this git won't ask to accept a key.
export GIT_SSH=/root/mesos-ec2/ssh-no-keychecking
-MASTERS=/root/mesos-ec2/masters
-SLAVES=/root/mesos-ec2/slaves
-ZOO=/root/mesos-ec2/zoo
+MASTERS_FILE="masters"
+MASTERS=`cat $MASTERS_FILE`
+NUM_MASTERS=`cat $MASTERS_FILE | wc -l`
+SLAVES=`cat slaves`
+ZOOS=`cat zoo`
-if [[ `cat $ZOO` = *zoo* ]]; then
- ISFT=0
+if [[ $ZOOS = *zoo* ]]; then
+ NUM_ZOOS=0
else
- ISFT=`cat $ZOO | wc -l`
+ NUM_ZOOS=`cat zoo | wc -l`
fi
# Scripts that get used for/while running Mesos.
@@ -53,7 +55,7 @@ echo "Setting executable permissions on
for s in $SCRIPTS; do chmod u+x $s; done
echo "SSH'ing to master machine(s) to approve key(s)..."
-for master in `cat $MASTERS`; do
+for master in $MASTERS; do
echo $master
ssh $SSH_OPTS $master echo -n &
sleep 0.3
@@ -61,10 +63,10 @@ done
ssh -q $SSH_OPTS localhost echo -n
-if [[ $ISFT != 0 ]] ; then
+if [[ $NUM_ZOOS != 0 ]] ; then
echo "SSH'ing to Zoo server(s) to approve keys..."
zid=1
- for zoo in `cat $ZOO`; do
+ for zoo in $ZOO; do
echo $zoo
ssh $SSH_OPTS $zoo echo -n \; mkdir -p /tmp/zookeeper \; echo $zid \> /tmp/zookeeper/myid
zid=$(($zid+1))
@@ -73,7 +75,7 @@ if [[ $ISFT != 0 ]] ; then
fi
echo "SSH'ing to slaves to approve keys..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
ssh $SSH_OPTS $slave echo -n &
sleep 0.3
@@ -81,31 +83,31 @@ done
echo "Waiting for commands to finish..."
wait
-if [[ `cat $MASTERS | wc -l` > 1 ]] ; then
+if [[ $NUM_MASTERS -gt 1 ]] ; then
echo "RSYNC'ing /root/mesos-ec2 to other master servers..."
- for master in `cat $MASTERS | sed '1d'`; do
+ for master in `cat $MASTERS_FILE | sed '1d'`; do
echo $master
rsync -e "ssh $SSH_OPTS" -az /root/mesos-ec2 $master:/root
done
fi
-if [[ $ISFT != 0 ]] ; then
+if [[ $NUM_ZOOS != 0 ]] ; then
echo "RSYNC'ing /root/mesos-ec2 to other Zoo servers..."
- for zoo in `cat $ZOO`; do
+ for zoo in $ZOOS; do
echo $zoo
rsync -e "ssh $SSH_OPTS" -az /root/mesos-ec2 $zoo:/root
done
fi
echo "RSYNC'ing /root/mesos-ec2 to slaves..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
rsync -e "ssh $SSH_OPTS" -az /root/mesos-ec2 $slave:/root
scp ~/.ssh/id_rsa $slave:.ssh
done
echo "Setting up slaves..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
ssh -t $SSH_OPTS root@$slave "mesos-ec2/setup-slave"
done
@@ -113,16 +115,16 @@ done
echo "Setting up master as slave (i.e. for local)..."
./setup-slave
-if [[ `cat $MASTERS | wc -l` > 1 ]] ; then
- echo "RSYNC'ing Hadoop config files for HDFS to masters..."
- for master in `cat $MASTERS`; do
+if [[ $NUM_MASTERS -gt 1 ]] ; then
+ echo "RSYNC'ing Hadoop config files for HDFS to other masters..."
+ for master in `cat $MASTERS_FILE | sed '1d'`; do
echo $master
rsync -e "ssh $SSH_OPTS" -az $HADOOP_HOME/conf $master:$HADOOP_HOME
done
fi
echo "RSYNC'ing Hadoop config files for HDFS to slaves..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
rsync -e "ssh $SSH_OPTS" -az $HADOOP_HOME/conf $slave:$HADOOP_HOME
done
@@ -188,7 +190,7 @@ if [ ! -e /mnt/nfs ] ; then
exportfs -a
fi
echo "Mounting NFS on slaves..."
-for slave in `cat $SLAVES`; do
+for slave in $SLAVES; do
echo $slave
ssh -t $SSH_OPTS root@$slave "mkdir -p /nfs; mount $HOSTNAME:/nfs /nfs"
done
Modified: incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup-torque
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup-torque?rev=1132048&r1=1132047&r2=1132048&view=diff
==============================================================================
--- incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup-torque (original)
+++ incubator/mesos/trunk/ec2/deploy.lucid64/root/mesos-ec2/setup-torque Sun Jun 5 08:29:07 2011
@@ -2,16 +2,16 @@
cd /root/mesos-ec2
-SLAVES_FILE="/root/mesos-ec2/slaves"
-MASTER="`cat master`"
-SLAVES="`cat $SLAVES_FILE`"
+MASTERS=`cat master`
+SLAVES_FILE="slaves"
+SLAVES=`cat $SLAVES_FILE`
SCHEDULER_ITERATION=5
#These seem to be broken, i.e. missing directories after install
-#ssh $MASTER "apt-get install -y torque-server"
-#ssh $MASTER "apt-get install -y torque-scheduler"
-#ssh $MASTER "apt-get install -y torque-client"
+#ssh $MASTERS "apt-get install -y torque-server"
+#ssh $MASTERS "apt-get install -y torque-scheduler"
+#ssh $MASTERS "apt-get install -y torque-client"
#install torque: download/unzip torque
function installtorque {
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=1132048&r1=1132047&r2=1132048&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:29:07 2011
@@ -1,21 +1,26 @@
#!/bin/bash
cd /root/mesos-ec2
-MASTERS="`cat masters`"
-ACTIVE_MASTER="`cat masters | head -1`"
-SLAVES="`cat slaves`"
-ZOO="`cat zoo`"
+MASTERS=`cat masters`
+ACTIVE_MASTER=`cat masters | head -1`
+SLAVES=`cat slaves`
+ZOOS=`cat zoo`
-ISFT="`cat zoo | wc -l`"
+
+if [[ $ZOOS = *zoo* ]]; then
+ NUM_ZOOS=0
+else
+ NUM_ZOOS=`cat zoo | wc -l`
+fi
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"
-if [[ $ISFT == 0 ]]; then
+if [[ $NUM_ZOOS == 0 ]]; then
master_arg="1@${ACTIVE_MASTER}:5050"
else
master_arg="zoo://"
add=""
- for zoo in $ZOO; do
+ for zoo in $ZOOS; do
master_arg+=$add
master_arg+=$zoo":2181\mesos"
add=","
@@ -24,9 +29,9 @@ fi
echo "Running with master parameter: "$master_arg
-if [[ $ISFT != 0 ]]; then
+if [[ $NUM_ZOOS != 0 ]]; then
echo "Starting ZooKeeper on $ZOO"
- for zoo in $ZOO; do
+ for zoo in $ZOOS; do
ssh $SSH_OPTS $zoo "/root/mesos/third_party/zookeeper-*/bin/zkServer.sh start </dev/null >/dev/null"
done
@@ -77,9 +82,9 @@ for slave in $SLAVES; do
done
wait
-if [[ $ISFT != 0 ]]; then
+if [[ $NUM_ZOOS != 0 ]]; then
echo "ZooKeeper is running at"
- for zoo in $ZOO; do
+ for zoo in $ZOOS; do
echo " $zoo:2181"
done
fi
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=1132048&r1=1132047&r2=1132048&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:29:07 2011
@@ -1,8 +1,8 @@
#!/bin/bash
cd /root/mesos-ec2
-MASTERS="`cat masters`"
-SLAVES="`cat slaves`"
+MASTERS=`cat masters`
+SLAVES=`cat slaves`
SSH_OPTS="-o StrictHostKeyChecking=no -o ConnectTimeout=2"