Merge -r 732322:732323 from trunk to branch 0.20 to fix HADOOP-4937.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@732327 13f79535-47bb-0310-9956-ffa450edef68

src/contrib/hod/CHANGES.txt

@@ -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 @@ Release 0.20.0 - (unreleased changes)
     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

src/contrib/hod/hodlib/Hod/hadoop.py

@@ -564,6 +564,8 @@ class hadoopCluster:
                     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)