From f4b8135658e6c78158b2c89705ea7f7532184ac7 Mon Sep 17 00:00:00 2001 From: Andrew Kyle Purtell Date: Thu, 26 Nov 2009 08:42:32 +0000 Subject: [PATCH] [HBASE-1961] EC2 scripts; fix master launch bug git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@884464 13f79535-47bb-0310-9956-ffa450edef68 --- src/contrib/ec2/bin/launch-hbase-master | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/contrib/ec2/bin/launch-hbase-master b/src/contrib/ec2/bin/launch-hbase-master index 6398a2dc1db..229bd1a1608 100755 --- a/src/contrib/ec2/bin/launch-hbase-master +++ b/src/contrib/ec2/bin/launch-hbase-master @@ -29,16 +29,16 @@ bin=`dirname "$0"` 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}'`