Repository: hadoop Updated Branches: refs/heads/branch-2 026027166 -> 2a6497cc7
HDFS-8915. TestFSNamesystem.testFSLockGetWaiterCount fails intermittently. Contributed by Masatake Iwasaki. (cherry picked from commit 13fb1b50e608558b2970184908ee5b9fcd7eb7b6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2a6497cc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2a6497cc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2a6497cc Branch: refs/heads/branch-2 Commit: 2a6497cc7ca5b4a2941744963ce0c744f6fcd2a1 Parents: 0260271 Author: Kihwal Lee <[email protected]> Authored: Fri Aug 26 10:00:36 2016 -0500 Committer: Kihwal Lee <[email protected]> Committed: Fri Aug 26 10:00:36 2016 -0500 ---------------------------------------------------------------------- .../hdfs/server/namenode/TestFSNamesystem.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2a6497cc/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java index b9a2d15..572b40d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java @@ -30,6 +30,7 @@ import java.net.InetAddress; 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.FileStatus; import org.apache.hadoop.fs.FileUtil; @@ -56,6 +57,7 @@ import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeoutException; public class TestFSNamesystem { @@ -271,9 +273,16 @@ public class TestFSNamesystem { } latch.await(); - Thread.sleep(10); // Lets all threads get BLOCKED - 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"); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
