HADOOP-2740. Fix HOD to work with the configuration variables changed in

HADOOP-2404. Contributed by Hemanth Yamijala.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@616949 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -652,6 +652,9 @@ Release 0.16.0 - 2008-02-04
 
     HADOOP-2404. Fix backwards compatability with hadoop-0.15 configuration
     files that was broken by HADOOP-2185. (omalley)
+
+    HADOOP-2740. Fix HOD to work with the configuration variables changed in
+    HADOOP-2404. (Hemanth Yamijala via omalley)
     
 Release 0.15.3 - 2008-01-18
 

src/contrib/hod/hodlib/GridServices/hdfs.py

@@ -59,7 +59,7 @@ class HdfsExternal(MasterSlave):
                                     str(self.serviceDesc.dict['info_port'])
    else:
      # After Hadoop-2185
-     self.serviceDesc.dict['final-attrs']['dfs.http.bindAddress'] = "%s:%s" % \
+     self.serviceDesc.dict['final-attrs']['dfs.http.address'] = "%s:%s" % \
        (dict['host'], dict['info_port'])
 
   def getInfoAddrs(self):
@@ -70,7 +70,7 @@ class HdfsExternal(MasterSlave):
       infoaddr = k + ':' + attrs['dfs.info.port']
     else:
       # After Hadoop-2185
-      infoaddr = attrs['dfs.http.bindAddress']
+      infoaddr = attrs['dfs.http.address']
     return [infoaddr]
 
 class Hdfs(MasterSlave):
@@ -142,7 +142,7 @@ class Hdfs(MasterSlave):
       self.infoAddr = self.masterNode + ':' + dict['dfs.info.port']
     else:
       # After Hadoop-2185
-      self.infoAddr = dict['dfs.http.bindAddress']
+      self.infoAddr = dict['dfs.http.address']
    
   def _parseEquals(self, list):
     return parseEquals(list)
@@ -168,13 +168,13 @@ class Hdfs(MasterSlave):
       if 'dfs.info.bindAddress' not in attrs:
         return ServiceUtil.getUniqPort()
     else:
-      if 'dfs.http.bindAddress' not in attrs:
+      if 'dfs.http.address' not in attrs:
         return ServiceUtil.getUniqPort()
 
     if self.version < 16:
       p = attrs['dfs.info.port']
     else:
-      p = attrs['dfs.http.bindAddress'].split(':')[1]
+      p = attrs['dfs.http.address'].split(':')[1]
     try:
       return int(p)
     except:
@@ -182,7 +182,7 @@ class Hdfs(MasterSlave):
       if self.version < 16:
         raise ValueError, "Can't find port from attr dfs.info.port: %s" % (p)
       else:
-        raise ValueError, "Can't find port from attr dfs.http.bindAddress: %s" % (p)
+        raise ValueError, "Can't find port from attr dfs.http.address: %s" % (p)
 
   def _setWorkDirs(self, workDirs, envs, attrs, parentDirs, subDir):
     namedir = None
@@ -224,10 +224,10 @@ class Hdfs(MasterSlave):
      if 'dfs.info.port' not in attrs:
       attrs['dfs.info.port'] = 'fillinport'
     else:
-      # Addressing Hadoop-2815, added the following. Earlier versions don't
+      # Addressing Hadoop-2185, added the following. Earlier versions don't
       # care about this
-      if 'dfs.http.bindAddress' not in attrs:
-        attrs['dfs.http.bindAddress'] = 'fillinhostport'
+      if 'dfs.http.address' not in attrs:
+        attrs['dfs.http.address'] = 'fillinhostport'
 
     self._setWorkDirs(workDirs, envs, attrs, parentDirs, 'hdfs-nn')
 
@@ -305,11 +305,11 @@ class Hdfs(MasterSlave):
       if 'dfs.datanode.info.port' not in attrs:
         attrs['dfs.datanode.info.port'] = 'fillinport'
     else:
-      # Adding the following. Hadoop-2815
-      if 'dfs.datanode.bindAddress' not in attrs:
-        attrs['dfs.datanode.bindAddress'] = 'fillinhostport'
-      if 'dfs.datanode.http.bindAddress' not in attrs:
-        attrs['dfs.datanode.http.bindAddress'] = 'fillinhostport'
+      # Adding the following. Hadoop-2185
+      if 'dfs.datanode.address' not in attrs:
+        attrs['dfs.datanode.address'] = 'fillinhostport'
+      if 'dfs.datanode.http.address' not in attrs:
+        attrs['dfs.datanode.http.address'] = 'fillinhostport'
     
     self._setWorkDirs(workDirs, envs, attrs, parentDirs, 'hdfs-dn')
 

src/contrib/hod/hodlib/GridServices/mapred.py

@@ -65,7 +65,7 @@ class MapReduceExternal(MasterSlave):
                                       str(self.serviceDesc.dict['info_port'])
     else:
       # After Hadoop-2185
-      self.serviceDesc['final-attrs']['mapred.job.tracker.http.bindAddress'] = \
+      self.serviceDesc['final-attrs']['mapred.job.tracker.http.address'] = \
         "%s:%s" %(dict['host'], dict['info_port'])
 
   def getInfoAddrs(self):
@@ -76,8 +76,8 @@ class MapReduceExternal(MasterSlave):
       infoaddr = k + ':' + attrs['mapred.job.tracker.info.port']
     else:
       # After Hadoop-2185
-      # Note: earlier,we never respected mapred.job.tracker.http.bindAddress
-      infoaddr = attrs['mapred.job.tracker.http.bindAddress']
+      # Note: earlier,we never respected mapred.job.tracker.http.address
+      infoaddr = attrs['mapred.job.tracker.http.address']
     return [infoaddr]
   
 class MapReduce(MasterSlave):
@@ -144,7 +144,7 @@ class MapReduce(MasterSlave):
       self.infoAddr = self.masterNode + ':' + dict['mapred.job.tracker.info.port']
     else:
       # After Hadoop-2185
-      self.infoAddr = dict['mapred.job.tracker.http.bindAddress']
+      self.infoAddr = dict['mapred.job.tracker.http.address']
   
   def _parseEquals(self, list):
     return parseEquals(list)
@@ -171,13 +171,13 @@ class MapReduce(MasterSlave):
       if not 'mapred.job.tracker.info.port' in attrs:
         return ServiceUtil.getUniqPort()
     else:
-      if 'mapred.job.tracker.http.bindAddress' not in attrs:
+      if 'mapred.job.tracker.http.address' not in attrs:
         return ServiceUtil.getUniqPort()
 
     if self.version < 16:
       p = attrs['mapred.job.tracker.info.port']
     else:
-      p = attrs['mapred.job.tracker.http.bindAddress'].split(':')[1]
+      p = attrs['mapred.job.tracker.http.address'].split(':')[1]
     try:
       return int(p)
     except:
@@ -185,7 +185,7 @@ class MapReduce(MasterSlave):
       if self.version < 16:
         raise ValueError, "Can't find port from attr mapred.job.tracker.info.port: %s" % (p)
       else:
-        raise ValueError, "Can't find port from attr mapred.job.tracker.http.bindAddress: %s" % (p)
+        raise ValueError, "Can't find port from attr mapred.job.tracker.http.address: %s" % (p)
 
   def _setWorkDirs(self, workDirs, envs, attrs, parentDirs, subDir):
     local = []
@@ -232,9 +232,9 @@ class MapReduce(MasterSlave):
       if 'mapred.job.tracker.info.port' not in attrs:
         attrs['mapred.job.tracker.info.port'] = 'fillinport'
     else:
-      # Addressing Hadoop-2815,
-      if 'mapred.job.tracker.http.bindAddress' not in attrs:
-        attrs['mapred.job.tracker.http.bindAddress'] = 'fillinhostport'
+      # Addressing Hadoop-2185,
+      if 'mapred.job.tracker.http.address' not in attrs:
+        attrs['mapred.job.tracker.http.address'] = 'fillinhostport'
 
     attrs['fs.default.name'] = hdfs.getMasterAddrs()[0]
 
@@ -274,11 +274,11 @@ class MapReduce(MasterSlave):
       # earlier to 16, tasktrackers always took ephemeral port 0 for
       # tasktracker.report.bindAddress
     else:
-      # Adding the following. Hadoop-2815
-      if 'mapred.task.tracker.report.bindAddress' not in attrs:
-        attrs['mapred.task.tracker.report.bindAddress'] = 'fillinhostport'
-      if 'mapred.task.tracker.http.bindAddress' not in attrs:
-        attrs['mapred.task.tracker.http.bindAddress'] = 'fillinhostport'
+      # Adding the following. Hadoop-2185
+      if 'mapred.task.tracker.report.address' not in attrs:
+        attrs['mapred.task.tracker.report.address'] = 'fillinhostport'
+      if 'mapred.task.tracker.http.address' not in attrs:
+        attrs['mapred.task.tracker.http.address'] = 'fillinhostport'
 
     self._setWorkDirs(workDirs, envs, attrs, parentDirs, 'mapred-tt')
 

src/contrib/hod/hodlib/HodRing/hodRing.py

@@ -564,7 +564,7 @@ class HodRing(hodBaseService):
         jettyAddr = jobTrackerAddr.split(':')[0] + ':' + \
                               attrs['mapred.job.tracker.info.port']
       else:
-        jettyAddr = attrs['mapred.job.tracker.http.bindAddress']
+        jettyAddr = attrs['mapred.job.tracker.http.address']
       self.log.debug("Jobtracker jetty : %s" % jettyAddr)
 
       # Check for Jetty to come up