Merge -r 679285:679286 from trunk onto branch-0.18. Fixes HADOOP-3808.

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

src/contrib/hod/CHANGES.txt

@@ -14,6 +14,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3610. Modified HOD to create cluster directory if one does not
     exist when using the script option. (Vinod Kumar Vavilapalli via yhemanth)
 
+    HADOOP-3808. Modified HOD to include RPC port of the JobTracker
+    into the notes attribute of the resource manager. (yhemanth)
+
   NEW FEATURES
 
   IMPROVEMENTS

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

@@ -509,6 +509,8 @@ class hadoopCluster:
                     workerInfoMap = {}
                     workerInfoMap['HDFS UI'] = 'http://%s' % self.hdfsInfo
                     workerInfoMap['Mapred UI'] = 'http://%s' % self.mapredInfo
+                    if mapredAddr.find(':') != -1:
+                      workerInfoMap['Mapred RPC Port'] = mapredAddr.split(':')[1]
                     ret = self.__nodePool.updateWorkerInfo(workerInfoMap, self.jobId)
                     if ret != 0:
                       self.__log.warn('Could not update HDFS and Mapred information.' \

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

@@ -112,7 +112,7 @@ class NodePool:
     """Check if job can run by looking at any user/job limits"""
     raise NotImplementedError
 
-  def updateWorkerInfo(self, workerInfoMap):
+  def updateWorkerInfo(self, workerInfoMap, jobId):
     """Update information about the workers started by this NodePool."""
     raise NotImplementedError