[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
This commit is contained in:
parent
dd23e89d3a
commit
f4b8135658
|
@ -29,16 +29,16 @@ bin=`dirname "$0"`
|
||||||
bin=`cd "$bin"; pwd`
|
bin=`cd "$bin"; pwd`
|
||||||
. "$bin"/hbase-ec2-env.sh
|
. "$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
|
if [ -z $AWS_ACCOUNT_ID ]; then
|
||||||
echo "Please set AWS_ACCOUNT_ID in $bin/hbase-ec2-env.sh."
|
echo "Please set AWS_ACCOUNT_ID in $bin/hbase-ec2-env.sh."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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"
|
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=`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}'`
|
MASTER_EC2_HOST=`echo "$MASTER_EC2_HOST" | awk '"INSTANCE" == $1 && "running" == $6 {print $4}'`
|
||||||
|
|
Loading…
Reference in New Issue