Author: apurtell
Date: Thu Nov 26 18:54:14 2009
New Revision: 884663
URL: http://svn.apache.org/viewvc?rev=884663&view=rev
Log:
HBASE-1961 EC2 scripts; better AMI version check
Modified:
hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image
hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-master
hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-slaves
hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-zookeeper
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image?rev=884663&r1=884662&r2=884663&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/create-hbase-image Thu Nov 26
18:54:14 2009
@@ -32,7 +32,7 @@
echo "INSTANCE_TYPE is $type"
echo "ARCH is $arch"
-AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep $S3_BUCKET | grep hbase |
grep $HBASE_VERSION | grep $arch | grep available | awk '{print $2}'`
+AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep $S3_BUCKET | grep hbase |
grep $HBASE_VERSION-$arch | grep available | awk '{print $2}'`
[ ! -z $AMI_IMAGE ] && echo "AMI already registered, use: ec2-deregister
$AMI_IMAGE" && exit 1
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=884663&r1=884662&r2=884663&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
18:54:14 2009
@@ -52,7 +52,7 @@
fi
# Finding HBase image
-[ -z "$AMI_IMAGE" ] && AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep
$S3_BUCKET | grep $HBASE_VERSION | grep $arch | grep available | awk '{print
$2}'`
+[ -z "$AMI_IMAGE" ] && AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep
$S3_BUCKET | grep $HBASE_VERSION-$arch | grep available | awk '{print $2}'`
# Start a master
echo "Starting master with AMI $AMI_IMAGE (arch $arch)"
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-slaves
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-slaves?rev=884663&r1=884662&r2=884663&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-slaves (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-slaves Thu Nov 26
18:54:14 2009
@@ -41,7 +41,7 @@
exit 1
fi
-[ -z "$AMI_IMAGE" ] && AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep
$S3_BUCKET | grep $HBASE_VERSION | grep $SLAVE_ARCH |grep available | awk
'{print $2}'`
+[ -z "$AMI_IMAGE" ] && AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a | grep
$S3_BUCKET | grep $HBASE_VERSION-$SLAVE_ARCH |grep available | awk '{print $2}'`
MASTER_HOST=`cat $MASTER_PRIVATE_IP_PATH`
MASTER_ZONE=`cat $MASTER_ZONE_PATH`
Modified: hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-zookeeper
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-zookeeper?rev=884663&r1=884662&r2=884663&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-zookeeper (original)
+++ hadoop/hbase/trunk/src/contrib/ec2/bin/launch-hbase-zookeeper Thu Nov 26
18:54:14 2009
@@ -41,7 +41,7 @@
[ -z "$arch" ] && arch=$SLAVE_ARCH
# Finding HBase image
-[ -z "$ZOO_AMI_IMAGE" ] && ZOO_AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a |
grep $S3_BUCKET | grep hbase | grep $HBASE_VERSION | grep $arch |grep available
| awk '{print $2}'`
+[ -z "$ZOO_AMI_IMAGE" ] && ZOO_AMI_IMAGE=`ec2-describe-images $TOOL_OPTS -a |
grep $S3_BUCKET | grep hbase | grep $HBASE_VERSION-$arch |grep available | awk
'{print $2}'`
# Start Zookeeper instances
