You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2009/11/26 09:42:32 UTC
svn commit: r884464 -
/hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master
Author: apurtell
Date: Thu Nov 26 08:42:32 2009
New Revision: 884464
URL: http://svn.apache.org/viewvc?rev=884464&view=rev
Log:
[HBASE-1961] EC2 scripts; fix master launch bug
Modified:
hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master?rev=884464&r1=884463&r2=884464&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master Thu Nov 26 08:42:32 2009
@@ -29,16 +29,16 @@
bin=`cd "$bin"; pwd`
. "$bin"/hbase-ec2-env.sh
-type=$MASTER_INSTANCE_TYPE
-[ -z "$type" ] && type=$SLAVE_INSTANCE_TYPE
-arch=$MASTER_ARCH
-[ -z "$arch" ] && arch=$SLAVE_ARCH
-
if [ -z $AWS_ACCOUNT_ID ]; then
echo "Please set AWS_ACCOUNT_ID in $bin/hbase-ec2-env.sh."
exit 1
fi
+type=$MASTER_INSTANCE_TYPE
+[ -z "$type" ] && type=$SLAVE_INSTANCE_TYPE
+arch=$MASTER_ARCH
+[ -z "$arch" ] && arch=$SLAVE_ARCH
+
echo "Testing for existing master in group: $CLUSTER"
MASTER_EC2_HOST=`ec2-describe-instances $TOOL_OPTS | awk '"RESERVATION" == $1 && "'$CLUSTER_MASTER'" == $4, "RESERVATION" == $1 && "'$CLUSTER_MASTER'" != $4'`
MASTER_EC2_HOST=`echo "$MASTER_EC2_HOST" | awk '"INSTANCE" == $1 && "running" == $6 {print $4}'`