You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ac...@apache.org on 2008/10/15 00:04:39 UTC
svn commit: r704713 - in /hadoop/core/branches/branch-0.19: ./
src/contrib/hod/CHANGES.txt src/contrib/hod/hodlib/GridServices/hdfs.py
src/contrib/hod/hodlib/GridServices/mapred.py
src/contrib/hod/hodlib/Hod/hadoop.py src/contrib/hod/testing/testHadoop.py
Author: acmurthy
Date: Tue Oct 14 15:04:39 2008
New Revision: 704713
URL: http://svn.apache.org/viewvc?rev=704713&view=rev
Log:
Merge -r 704711:704712 from trunk to branch-0.19 to fix HADOOP-3814.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/src/contrib/hod/CHANGES.txt
hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/hdfs.py
hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/mapred.py
hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/Hod/hadoop.py
hadoop/core/branches/branch-0.19/src/contrib/hod/testing/testHadoop.py
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 14 15:04:39 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703
+/hadoop/core/trunk:697306,698176,699056,699098,699415,699424,699444,699490,699517,700163,700628,700923,701273,701398,703923,704203,704261,704701,704703,704707,704712
Modified: hadoop/core/branches/branch-0.19/src/contrib/hod/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hod/CHANGES.txt?rev=704713&r1=704712&r2=704713&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hod/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hod/CHANGES.txt Tue Oct 14 15:04:39 2008
@@ -31,6 +31,9 @@
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
Modified: hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/hdfs.py
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/hdfs.py?rev=704713&r1=704712&r2=704713&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/hdfs.py (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/hdfs.py Tue Oct 14 15:04:39 2008
@@ -176,7 +176,6 @@
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"
Modified: hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/mapred.py
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/mapred.py?rev=704713&r1=704712&r2=704713&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/mapred.py (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/GridServices/mapred.py Tue Oct 14 15:04:39 2008
@@ -180,7 +180,6 @@
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
Modified: hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/Hod/hadoop.py
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/Hod/hadoop.py?rev=704713&r1=704712&r2=704713&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/Hod/hadoop.py (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hod/hodlib/Hod/hadoop.py Tue Oct 14 15:04:39 2008
@@ -74,8 +74,6 @@
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
Modified: hadoop/core/branches/branch-0.19/src/contrib/hod/testing/testHadoop.py
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/contrib/hod/testing/testHadoop.py?rev=704713&r1=704712&r2=704713&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/src/contrib/hod/testing/testHadoop.py (original)
+++ hadoop/core/branches/branch-0.19/src/contrib/hod/testing/testHadoop.py Tue Oct 14 15:04:39 2008
@@ -93,8 +93,6 @@
# 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