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 sh...@apache.org on 2011/09/24 20:07:11 UTC
svn commit: r1175212 - in
/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common:
CHANGES.txt src/test/java/org/apache/hadoop/fs/TestTrash.java
Author: shv
Date: Sat Sep 24 18:07:10 2011
New Revision: 1175212
URL: http://svn.apache.org/viewvc?rev=1175212&view=rev
Log:
HADOOP-7663. Fix TestHDFSTrash failure. Contributed by Mayank Bansal.
Modified:
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1175212&r1=1175211&r2=1175212&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Sat Sep 24 18:07:10 2011
@@ -264,9 +264,6 @@ Release 0.23.0 - Unreleased
HADOOP-7430. Improve error message when moving to trash fails due to
quota issue. (Ravi Prakash via mattf)
- HADOOP-7457. Remove out-of-date Chinese language documentation.
- (Jakob Homan via eli)
-
HADOOP-7444. Add Checksum API to verify and calculate checksums "in bulk"
(todd)
@@ -1117,6 +1114,11 @@ Release 0.22.0 - Unreleased
HADOOP-7568. SequenceFile should not print into stdout.
(Plamen Jeliazkov via shv)
+ HADOOP-7663. Fix TestHDFSTrash failure. (Mayank Bansal via shv)
+
+ HADOOP-7457. Remove out-of-date Chinese language documentation.
+ (Jakob Homan via eli)
+
Release 0.21.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java?rev=1175212&r1=1175211&r2=1175212&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java Sat Sep 24 18:07:10 2011
@@ -486,6 +486,9 @@ public class TestTrash extends TestCase
conf.set(FS_TRASH_INTERVAL_KEY, "0.2"); // 12 seconds
conf.setClass("fs.file.impl", TestLFS.class, FileSystem.class);
conf.set(FS_TRASH_CHECKPOINT_INTERVAL_KEY, "0.1"); // 6 seconds
+ FileSystem fs = FileSystem.getLocal(conf);
+ conf.set("fs.default.name", fs.getUri().toString());
+
Trash trash = new Trash(conf);
// Start Emptier in background
@@ -493,8 +496,6 @@ public class TestTrash extends TestCase
Thread emptierThread = new Thread(emptier);
emptierThread.start();
- FileSystem fs = FileSystem.getLocal(conf);
- conf.set("fs.defaultFS", fs.getUri().toString());
FsShell shell = new FsShell();
shell.setConf(conf);
shell.init();