Author: eli
Date: Tue Nov 9 01:59:27 2010
New Revision: 1032811
URL: http://svn.apache.org/viewvc?rev=1032811&view=rev
Log:
HDFS-1240. svn merge -c 1032810 from branch-0.20.
Modified:
hadoop/common/branches/branch-0.20-append/ (props changed)
hadoop/common/branches/branch-0.20-append/CHANGES.txt (contents, props
changed)
hadoop/common/branches/branch-0.20-append/src/mapred/ (props changed)
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
Propchange: hadoop/common/branches/branch-0.20-append/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 01:59:27 2010
@@ -1,3 +1,4 @@
+/hadoop/common/branches/branch-0.20:1032810
/hadoop/common/trunk:910709
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-append/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-append/CHANGES.txt?rev=1032811&r1=1032810&r2=1032811&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-append/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-append/CHANGES.txt Tue Nov 9 01:59:27
2010
@@ -124,6 +124,9 @@ Release 0.20.3 - Unreleased
HDFS-1258. Clearing namespace quota on "/" corrupts fs image.
(Aaron T. Myers via szetszwo)
+ HDFS-1240. TestDFSShell failing in branch-20.
+ (Todd Lipcon via Eli Collins)
+
IMPROVEMENTS
MAPREDUCE-1407. Update javadoc in mapreduce.{Mapper,Reducer} to match
Propchange: hadoop/common/branches/branch-0.20-append/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 01:59:27 2010
@@ -1,3 +1,4 @@
+/hadoop/common/branches/branch-0.20/CHANGES.txt:1032810
/hadoop/common/trunk/CHANGES.txt:910709
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
Propchange: hadoop/common/branches/branch-0.20-append/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 9 01:59:27 2010
@@ -1,3 +1,4 @@
+/hadoop/common/branches/branch-0.20/src/mapred:1032810
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
/hadoop/mapreduce/trunk/src/java:808650
Modified:
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java?rev=1032811&r1=1032810&r2=1032811&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
(original)
+++
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/MiniDFSCluster.java
Tue Nov 9 01:59:27 2010
@@ -52,9 +52,6 @@ import org.apache.hadoop.util.ToolRunner
*/
public class MiniDFSCluster {
- public static final File BASE_DIR =
- new File(System.getProperty("test.build.data", "build/test/data"), "dfs/");
-
public class DataNodeProperties {
DataNode datanode;
Configuration conf;
@@ -243,7 +240,7 @@ public class MiniDFSCluster {
ioe.initCause(e);
throw ioe;
}
- base_dir = BASE_DIR;
+ base_dir = getBaseDir();
data_dir = new File(base_dir, "data");
// Setup the NameNode configuration
@@ -907,4 +904,9 @@ public class MiniDFSCluster {
public String getDataDirectory() {
return data_dir.getAbsolutePath();
}
+
+ public static File getBaseDir() {
+ return new File(System.getProperty(
+ "test.build.data", "build/test/data"), "dfs/");
+ }
}
Modified:
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java?rev=1032811&r1=1032810&r2=1032811&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
(original)
+++
hadoop/common/branches/branch-0.20-append/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogRace.java
Tue Nov 9 01:59:27 2010
@@ -287,7 +287,7 @@ public class TestEditLogRace extends Tes
private Configuration getConf() {
Configuration conf = new Configuration();
- conf.set("dfs.name.dir", MiniDFSCluster.BASE_DIR + "/data");
+ conf.set("dfs.name.dir", MiniDFSCluster.getBaseDir() + "/data");
conf.setBoolean("dfs.permissions", false);
return conf;
}
