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 2008/09/09 10:33:20 UTC
svn commit: r693404 - in /hadoop/core/trunk: CHANGES.txt
src/contrib/ec2/bin/launch-hadoop-master
Author: tomwhite
Date: Tue Sep 9 01:33:19 2008
New Revision: 693404
URL: http://svn.apache.org/viewvc?rev=693404&view=rev
Log:
HADOOP-3605. Make EC2 scripts show an error message if AWS_ACCOUNT_ID is unset. Contributed by Al Hoang.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-master
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=693404&r1=693403&r2=693404&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Sep 9 01:33:19 2008
@@ -288,6 +288,9 @@
HADOOP-3361. Implement renames for NativeS3FileSystem.
(Albert Chern via tomwhite)
+ HADOOP-3605. Make EC2 scripts show an error message if AWS_ACCOUNT_ID is
+ unset. (Al Hoang via tomwhite)
+
OPTIMIZATIONS
HADOOP-3556. Removed lock contention in MD5Hash by changing the
Modified: hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-master
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-master?rev=693404&r1=693403&r2=693404&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-master (original)
+++ hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-master Tue Sep 9 01:33:19 2008
@@ -29,6 +29,11 @@
bin=`cd "$bin"; pwd`
. "$bin"/hadoop-ec2-env.sh
+if [ -z $AWS_ACCOUNT_ID ]; then
+ echo "Please set AWS_ACCOUNT_ID in $bin/hadoop-ec2-env.sh."
+ exit -1
+fi
+
echo "Testing for existing master in group: $CLUSTER"
MASTER_EC2_HOST=`ec2-describe-instances | 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}'`
@@ -108,4 +113,4 @@
ssh $SSH_OPTS "root@$MASTER_EC2_HOST" "chmod 600 /root/.ssh/id_rsa"
MASTER_IP=`dig +short $MASTER_EC2_HOST`
-echo "Master is $MASTER_EC2_HOST, ip is $MASTER_IP, zone is $MASTER_EC2_ZONE."
\ No newline at end of file
+echo "Master is $MASTER_EC2_HOST, ip is $MASTER_IP, zone is $MASTER_EC2_ZONE."