From d715e7162cd34c6ef8f91727204953c560df7089 Mon Sep 17 00:00:00 2001 From: Josh Elser Date: Fri, 1 May 2015 12:37:49 -0400 Subject: [PATCH] HBASE-13591 Attempt to stabilize TestHBaseFsck --- .../test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index 349df67..fa16068 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -607,7 +607,7 @@ public class TestHBaseFsck { } /** - * This test makes sure that with 5 retries both parallel instances + * This test makes sure that with 10 retries both parallel instances * of hbck will be completed successfully. * * @throws Exception @@ -621,7 +621,10 @@ public class TestHBaseFsck { @Override public HBaseFsck call() throws Exception { - return doFsck(conf, false); + // Increase retry attempts to make sure the non-active hbck doesn't get starved + Configuration c = new Configuration(conf); + c.setInt("hbase.hbck.lockfile.attempts", 10); + return doFsck(c, false); } } service = Executors.newFixedThreadPool(2); @@ -629,7 +632,7 @@ public class TestHBaseFsck { hbck2 = service.submit(new RunHbck()); service.shutdown(); //wait for 15 seconds, for both hbck calls finish - service.awaitTermination(15, TimeUnit.SECONDS); + service.awaitTermination(25, TimeUnit.SECONDS); HBaseFsck h1 = hbck1.get(); HBaseFsck h2 = hbck2.get(); // Both should be successful -- 2.1.2