Author: ddas
Date: Thu Jul 24 03:35:56 2008
New Revision: 679343
URL: http://svn.apache.org/viewvc?rev=679343&view=rev
Log:
Merge -r 679285:679286 from trunk onto branch-0.18. Fixes HADOOP-3808.
Modified:
hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/hadoop.py
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/nodePool.py
Modified: hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt?rev=679343&r1=679342&r2=679343&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt Thu Jul 24
03:35:56 2008
@@ -14,6 +14,9 @@
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
Modified: hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/hadoop.py
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/hadoop.py?rev=679343&r1=679342&r2=679343&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/hadoop.py
(original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/hadoop.py Thu
Jul 24 03:35:56 2008
@@ -509,6 +509,8 @@
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.' \
Modified:
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/nodePool.py
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/nodePool.py?rev=679343&r1=679342&r2=679343&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/nodePool.py
(original)
+++ hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/Hod/nodePool.py Thu
Jul 24 03:35:56 2008
@@ -112,7 +112,7 @@
"""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
