Merge -r 669087:669088 from trunk onto 0.18 branch. Fixes HADOOP-3564.

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

src/contrib/hod/CHANGES.txt

@@ -37,6 +37,10 @@ Release 0.18.0 - Unreleased
     HADOOP-3531. Fixes a bug related to handling JobTracker failures because of
     timing issues on slow nodes. (Hemanth Yamijala via ddas)
 
+    HADOOP-3564. HOD generates values for the parameter dfs.datanode.ipc.address
+    in the hadoop-site.xml created on datanodes. 
+    (Vinod Kumar Vavilapalli via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

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

@@ -277,6 +277,11 @@ class Hdfs(MasterSlave):
       if 'dfs.datanode.http.address' not in attrs:
         attrs['dfs.datanode.http.address'] = 'fillinhostport'
     
+    if self.version >= 18:
+      # After HADOOP-3283
+      # TODO: check for major as well as minor versions
+      attrs['dfs.datanode.ipc.address'] = 'fillinhostport'
+                    
     self._setWorkDirs(workDirs, envs, attrs, parentDirs, 'hdfs-dn')
 
     dict = { 'name' : 'datanode' }