Author: tomwhite
Date: Thu May 21 14:30:10 2009
New Revision: 777129
URL: http://svn.apache.org/viewvc?rev=777129&view=rev
Log:
HADOOP-5839. Fix EC2 scripts to allow remote job submission. Contributed by
Joydeep Sen Sarma.
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh
hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-slaves
Modified: hadoop/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=777129&r1=777128&r2=777129&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu May 21 14:30:10 2009
@@ -377,6 +377,9 @@
HADOOP-5572. Improves the progress reporting for the sort phase for both
maps and reduces. (Ravi Gummadi via ddas)
+ HADOOP-5839. Fix EC2 scripts to allow remote job submission.
+ (Joydeep Sen Sarma via tomwhite)
+
OPTIMIZATIONS
HADOOP-5595. NameNode does not need to run a replicator to choose a
Modified: hadoop/core/trunk/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh?rev=777129&r1=777128&r2=777129&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh (original)
+++ hadoop/core/trunk/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh Thu May 21
14:30:10 2009
@@ -17,7 +17,9 @@
SECURITY_GROUPS=`wget -q -O -
http://169.254.169.254/latest/meta-data/security-groups`
IS_MASTER=`echo $SECURITY_GROUPS | awk '{ a = match ($0, "-master$"); if (a)
print "true"; else print "false"; }'`
if [ "$IS_MASTER" == "true" ]; then
- MASTER_HOST=`wget -q -O -
http://169.254.169.254/latest/meta-data/local-hostname`
+ # use public hostnames for master. private hostnames can be used by
substituting:
+ # MASTER_HOST=`wget -q -O -
http://169.254.169.254/latest/meta-data/local-hostname`
+ MASTER_HOST=`wget -q -O -
'http://169.254.169.254/latest/meta-data/public-hostname'`
fi
HADOOP_HOME=`ls -d /usr/local/hadoop-*`
@@ -78,6 +80,12 @@
<value>3</value>
</property>
+<property>
+ <name>hadoop.rpc.socket.factory.class.default</name>
+ <value>org.apache.hadoop.net.StandardSocketFactory</value>
+ <final>true</final>
+</property>
+
</configuration>
EOF
Modified: hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-slaves
URL:
http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-slaves?rev=777129&r1=777128&r2=777129&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-slaves (original)
+++ hadoop/core/trunk/src/contrib/ec2/bin/launch-hadoop-slaves Thu May 21
14:30:10 2009
@@ -42,7 +42,9 @@
# Finding Hadoop image
AMI_IMAGE=`ec2-describe-images -a | grep $S3_BUCKET | grep $HADOOP_VERSION |
grep $ARCH |grep available | awk '{print $2}'`
-MASTER_HOST=`cat $MASTER_PRIVATE_IP_PATH`
+# to use private master hostname, substitute below with:
+# MASTER_HOST=`cat $MASTER_PRIVATE_IP_PATH`
+MASTER_HOST=`cat $MASTER_IP_PATH`
MASTER_ZONE=`cat $MASTER_ZONE_PATH`
# Substituting master hostname
