hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r558548 - in /lucene/hadoop/branches/branch-0.13: CHANGES.txt src/contrib/ec2/bin/start-hadoop
Date Sun, 22 Jul 2007 20:54:14 GMT
Author: tomwhite
Date: Sun Jul 22 13:54:13 2007
New Revision: 558548

URL: http://svn.apache.org/viewvc?view=rev&rev=558548
Log:
Merge -r 558545:558546 from trunk to 0.13 branch. Fixes: HADOOP-1638.

Modified:
    lucene/hadoop/branches/branch-0.13/CHANGES.txt
    lucene/hadoop/branches/branch-0.13/src/contrib/ec2/bin/start-hadoop

Modified: lucene/hadoop/branches/branch-0.13/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/CHANGES.txt?view=diff&rev=558548&r1=558547&r2=558548
==============================================================================
--- lucene/hadoop/branches/branch-0.13/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.13/CHANGES.txt Sun Jul 22 13:54:13 2007
@@ -13,6 +13,9 @@
  3. HADOOP-1635.  Remove hardcoded keypair name and fix launch-hadoop-cluster
     to support later versions of ec2-api-tools.  (Stu Hood via tomwhite)
 
+ 4. HADOOP-1638.  Fix contrib EC2 scripts to support NAT addressing.
+    (Stu Hood via tomwhite) 
+
 
 Release 0.13.0 - 2007-06-08
 

Modified: lucene/hadoop/branches/branch-0.13/src/contrib/ec2/bin/start-hadoop
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.13/src/contrib/ec2/bin/start-hadoop?view=diff&rev=558548&r1=558547&r2=558548
==============================================================================
--- lucene/hadoop/branches/branch-0.13/src/contrib/ec2/bin/start-hadoop (original)
+++ lucene/hadoop/branches/branch-0.13/src/contrib/ec2/bin/start-hadoop Sun Jul 22 13:54:13
2007
@@ -12,8 +12,13 @@
   exit 1
 fi
 
+# Datanodes that are started separately from the rest of the cluster will
+# still use the $MASTER_HOST address to access the master
+echo "Adjusting master hadoop-site.xml to minimize DNS lookups"
+ssh $SSH_OPTS "root@$MASTER_HOST" "sed -i -e \"s/$MASTER_HOST/\$(hostname)/g\" /usr/local/hadoop-$HADOOP_VERSION/conf/hadoop-site.xml"
+
 echo "Creating slaves file and copying to master"
-ec2-describe-instances | grep INSTANCE | grep running | awk '{if ($7 != 0) print $4}' >
slaves
+ec2-describe-instances | grep INSTANCE | grep running | awk '{if ($7 != 0 && $8 !=
0) print $4}' > slaves
 scp $SSH_OPTS slaves "root@$MASTER_HOST:/usr/local/hadoop-$HADOOP_VERSION/conf/slaves"
 
 echo "Copying private key to master"



Mime
View raw message