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

HDFS-8915. TestFSNamesystem.testFSLockGetWaiterCount fails intermittently. Contributed by Masatake Iwasaki.

Browse Source 
(cherry picked from commit 13fb1b50e608558b2970184908ee5b9fcd7eb7b6)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java
Updated CHANGES.txt
This commit is contained in:
Kihwal Lee 2016-08-26 10:07:55 -05:00
parent 8aa18534d9
commit 8593225e85
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -26,6 +26,9 @@ Release 2.7.4 - UNRELEASED
HDFS-9745. TestSecureNNWithQJM#testSecureMode sometimes fails with
timeouts (Xiao Chen via jlowe)
HDFS-8915. TestFSNamesystem.testFSLockGetWaiterCount fails intermittently.
(Masatake Iwasaki via kihwal)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES

14
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java
View File

@ -27,6 +27,7 @@
import java.net.URI;
import java.util.Collection;
import com.google.common.base.Supplier;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hdfs.DFSTestUtil;
@ -48,6 +49,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeoutException;
public class TestFSNamesystem {
@ -241,8 +243,16 @@ public void run() {
}
latch.await();
Assert.assertEquals("Expected number of blocked thread not found",
threadCount, rwLock.getQueueLength());
try {
GenericTestUtils.waitFor(new Supplier<Boolean>() {
@Override
public Boolean get() {
return (threadCount == rwLock.getQueueLength());
}
}, 10, 1000);
} catch (TimeoutException e) {
fail("Expected number of blocked thread not found");
}
}
/**