Merge -r 704711:704712 from trunk to branch-0.19 to fix HADOOP-3814.

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

src/contrib/hod/CHANGES.txt

@@ -31,6 +31,9 @@ Release 0.19.0 - Unreleased
     job submission. 
     (Craig Macdonald and Vinod Kumar Vavilapalli via yhemanth)
 
+    HADOOP-3814. Remove generation of dfs.client.buffer.dir for the generated
+    hadoop-site.xml. (Vinod Kumar Vavilapalli via acmurthy)
+
 Release 0.18.1 - 2008-09-17
 
   INCOMPATIBLE CHANGES

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

@@ -176,7 +176,6 @@ class Hdfs(MasterSlave):
     attrs['dfs.name.dir'] = namedir
     attrs['hadoop.tmp.dir'] = hadooptmpdir
     attrs['dfs.data.dir'] = ','.join(datadir)
-    # FIXME -- change dfs.client.buffer.dir
     envs['HADOOP_ROOT_LOGGER'] = "INFO,DRFA"
 
 

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

@@ -180,7 +180,6 @@ class MapReduce(MasterSlave):
     attrs['mapred.local.dir'] = ','.join(local)
     attrs['mapred.system.dir'] = 'fillindir'
     attrs['mapred.temp.dir'] = temp
-    attrs['dfs.client.buffer.dir'] = ','.join(dfsclient)
     attrs['hadoop.tmp.dir'] = hadooptmpdir
 
 

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

@@ -74,8 +74,6 @@ class hadoopConfig:
     paramsDict = {  'mapred.job.tracker'    : mapredAddr , \
                     'fs.default.name'       : "hdfs://" + hdfsAddr, \
                     'hadoop.tmp.dir'        : tempDir, \
-                    'dfs.client.buffer.dir' : os.path.join(tempDir, 'dfs',
-                                                                    'tmp'),
                  }
 
     paramsDict['mapred.system.dir'] = mrSysDir

src/contrib/hod/testing/testHadoop.py

@@ -93,8 +93,6 @@ class test_hadoopConfig(unittest.TestCase):
     # fs.default.name should start with hdfs://
     assert(keyvals['fs.default.name'].startswith('hdfs://'))
     assert(keyvals['hadoop.tmp.dir'] == self.tempDir)
-    assert(keyvals['dfs.client.buffer.dir'] == os.path.join(self.tempDir,
-                                                            'dfs', 'tmp'))
 
     # TODO other tests
     pass