You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2007/07/22 22:18:05 UTC
svn commit: r558535 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt
src/contrib/ec2/bin/create-hadoop-image
src/contrib/ec2/bin/launch-hadoop-cluster
Author: tomwhite
Date: Sun Jul 22 13:18:04 2007
New Revision: 558535
URL: http://svn.apache.org/viewvc?view=rev&rev=558535
Log:
Merge -r 558533:558534 from trunk to 0.14 branch. Fixes: HADOOP-1635.
Modified:
lucene/hadoop/branches/branch-0.14/CHANGES.txt
lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/create-hadoop-image
lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/launch-hadoop-cluster
Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?view=diff&rev=558535&r1=558534&r2=558535
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Sun Jul 22 13:18:04 2007
@@ -392,6 +392,9 @@
default replication is sometimes reset to one on restart.
(Raghu Angadi via cutting)
+132. HADOOP-1635. Remove hardcoded keypair name and fix launch-hadoop-cluster
+ to support later versions of ec2-api-tools. (Stu Hood via tomwhite)
+
Release 0.13.0 - 2007-06-08
Modified: lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/create-hadoop-image
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/create-hadoop-image?view=diff&rev=558535&r1=558534&r2=558535
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/create-hadoop-image (original)
+++ lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/create-hadoop-image Sun Jul 22 13:18:04 2007
@@ -11,7 +11,7 @@
AMI_IMAGE=`ec2-describe-images -a | grep fedora-core4-base | awk '{print $2}'`
echo "Starting a fedora core base AMI with ID $AMI_IMAGE."
-OUTPUT=`ec2-run-instances $AMI_IMAGE -k gsg-keypair`
+OUTPUT=`ec2-run-instances $AMI_IMAGE -k $KEY_NAME`
BOOTING_INSTANCE=`echo $OUTPUT | awk '{print $6}'`
echo "Instance is $BOOTING_INSTANCE."
Modified: lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/launch-hadoop-cluster
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/launch-hadoop-cluster?view=diff&rev=558535&r1=558534&r2=558535
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/launch-hadoop-cluster (original)
+++ lucene/hadoop/branches/branch-0.14/src/contrib/ec2/bin/launch-hadoop-cluster Sun Jul 22 13:18:04 2007
@@ -21,7 +21,7 @@
# Start a cluster
echo "Starting cluster with AMI $AMI_IMAGE"
-RUN_INSTANCES_OUTPUT=`ec2-run-instances $AMI_IMAGE -n $NO_INSTANCES -g $GROUP -k gsg-keypair -d "$NO_INSTANCES,$MASTER_HOST" | grep INSTANCE | awk '{print $2}'`
+RUN_INSTANCES_OUTPUT=`ec2-run-instances $AMI_IMAGE -n $NO_INSTANCES -g $GROUP -k $KEY_NAME -d "$NO_INSTANCES,$MASTER_HOST" | grep INSTANCE | awk '{print $2}'`
for instance in $RUN_INSTANCES_OUTPUT; do
echo "Waiting for instance $instance to start"
while true; do
@@ -36,6 +36,6 @@
done
echo "Appointing master"
-MASTER_EC2_HOST=`ec2-describe-instances | grep INSTANCE | grep running | awk '{if ($7 == 0) print $4}'`
+MASTER_EC2_HOST=`ec2-describe-instances | grep INSTANCE | grep running | awk '{if ($8 == 0 || $7 == 0) print $4}'`
MASTER_IP=`dig +short $MASTER_EC2_HOST`
echo "Master is $MASTER_EC2_HOST. Please set up DNS so $MASTER_HOST points to $MASTER_IP."