Author: yhemanth
Date: Wed Jan 7 05:19:15 2009
New Revision: 732327
URL: http://svn.apache.org/viewvc?rev=732327&view=rev
Log:
Merge -r 732322:732323 from trunk to branch 0.20 to fix HADOOP-4937.
Modified:
hadoop/core/branches/branch-0.20/src/contrib/hod/CHANGES.txt
hadoop/core/branches/branch-0.20/src/contrib/hod/hodlib/Hod/hadoop.py
Modified: hadoop/core/branches/branch-0.20/src/contrib/hod/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/hod/CHANGES.txt?rev=732327&r1=732326&r2=732327&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/src/contrib/hod/CHANGES.txt Wed Jan 7
05:19:15 2009
@@ -1,17 +1,5 @@
HOD Change Log
-Trunk (unreleased changes)
-
- INCOMPATIBLE CHANGES
-
- NEW FEATURES
-
- IMPROVEMENTS
-
- OPTIMIZATIONS
-
- BUG FIXES
-
Release 0.20.0 - (unreleased changes)
INCOMPATIBLE CHANGES
@@ -23,6 +11,9 @@
HADOOP-4705. Grant read permissions for files/directories
created by HOD. (Peeyush Bishnoi via yhemanth)
+ HADOOP-4937. Include ringmaster RPC port in the notes
+ attribute. (Peeyush Bishnoi via yhemanth)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/core/branches/branch-0.20/src/contrib/hod/hodlib/Hod/hadoop.py
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/contrib/hod/hodlib/Hod/hadoop.py?rev=732327&r1=732326&r2=732327&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/contrib/hod/hodlib/Hod/hadoop.py
(original)
+++ hadoop/core/branches/branch-0.20/src/contrib/hod/hodlib/Hod/hadoop.py Wed
Jan 7 05:19:15 2009
@@ -564,6 +564,8 @@
workerInfoMap = {}
workerInfoMap['HDFS UI'] = 'http://%s' % self.hdfsInfo
workerInfoMap['Mapred UI'] = 'http://%s' % self.mapredInfo
+ # Ringmaster URL sample format : http://hostname:port/
+ workerInfoMap['RM RPC Port'] = '%s' %
self.ringmasterXRS.split(":")[2].strip("/")
if mapredAddr.find(':') != -1:
workerInfoMap['Mapred RPC Port'] =
mapredAddr.split(':')[1]
ret = self.__nodePool.updateWorkerInfo(workerInfoMap,
self.jobId)
