Author: ddas
Date: Tue Jun 17 22:46:16 2008
New Revision: 669089

URL: http://svn.apache.org/viewvc?rev=669089&view=rev
Log:
Merge -r 669087:669088 from trunk onto 0.18 branch. Fixes HADOOP-3564.

Modified:
    hadoop/core/branches/branch-0.18/src/contrib/hod/CHANGES.txt
    hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/GridServices/hdfs.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=669089&r1=669088&r2=669089&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 Tue Jun 17 
22:46:16 2008
@@ -37,6 +37,10 @@
     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

Modified: 
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/GridServices/hdfs.py
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/GridServices/hdfs.py?rev=669089&r1=669088&r2=669089&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/GridServices/hdfs.py 
(original)
+++ 
hadoop/core/branches/branch-0.18/src/contrib/hod/hodlib/GridServices/hdfs.py 
Tue Jun 17 22:46:16 2008
@@ -277,6 +277,11 @@
       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' }


Reply via email to