HADOOP-7663. Fix TestHDFSTrash failure. Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1175207 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
029914af84
commit
e7b63aebcb
@ -1137,6 +1137,8 @@ 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)
|
||||
|
||||
|
@ -486,6 +486,9 @@ public void testTrashEmptier() throws Exception {
|
||||
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 void testTrashEmptier() throws Exception {
|
||||
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();
|
||||
|
Loading…
Reference in New Issue
Block a user