Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-7663. Fix TestHDFSTrash failure. Contributed by Mayank Bansal. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175212 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Shvachko 2011-09-24 18:07:10 +00:00
parent 0c0043538e
commit 046fbd608f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -264,9 +264,6 @@ Release 0.23.0 - Unreleased
HADOOP-7430. Improve error message when moving to trash fails due to HADOOP-7430. Improve error message when moving to trash fails due to
quota issue. (Ravi Prakash via mattf) 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" HADOOP-7444. Add Checksum API to verify and calculate checksums "in bulk"
(todd) (todd)
@ -1117,6 +1114,11 @@ Release 0.22.0 - Unreleased
HADOOP-7568. SequenceFile should not print into stdout. HADOOP-7568. SequenceFile should not print into stdout.
(Plamen Jeliazkov via shv) (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 Release 0.21.1 - Unreleased
IMPROVEMENTS IMPROVEMENTS

5
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
View File

@ -486,6 +486,9 @@ public class TestTrash extends TestCase {
conf.set(FS_TRASH_INTERVAL_KEY, "0.2"); // 12 seconds conf.set(FS_TRASH_INTERVAL_KEY, "0.2"); // 12 seconds
conf.setClass("fs.file.impl", TestLFS.class, FileSystem.class); conf.setClass("fs.file.impl", TestLFS.class, FileSystem.class);
conf.set(FS_TRASH_CHECKPOINT_INTERVAL_KEY, "0.1"); // 6 seconds 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); Trash trash = new Trash(conf);
// Start Emptier in background // Start Emptier in background
@ -493,8 +496,6 @@ public class TestTrash extends TestCase {
Thread emptierThread = new Thread(emptier); Thread emptierThread = new Thread(emptier);
emptierThread.start(); emptierThread.start();
FileSystem fs = FileSystem.getLocal(conf);
conf.set("fs.defaultFS", fs.getUri().toString());
FsShell shell = new FsShell(); FsShell shell = new FsShell();
shell.setConf(conf); shell.setConf(conf);
shell.init(); shell.init();