Repository: hbase Updated Branches: refs/heads/branch-1.1 c552e37b4 -> 3eb53005a
HBASE-13591 Attempt to stabilize TestHBaseFsck Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3eb53005 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3eb53005 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3eb53005 Branch: refs/heads/branch-1.1 Commit: 3eb53005aea4944878bf20a575b39fa82694c96e Parents: c552e37 Author: Josh Elser <[email protected]> Authored: Fri May 1 12:37:49 2015 -0400 Committer: Nick Dimiduk <[email protected]> Committed: Tue May 5 15:38:13 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3eb53005/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java ---------------------------------------------------------------------- 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 e96c207..ba864dd 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 @@ -614,7 +614,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 @@ -628,7 +628,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); @@ -636,7 +639,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
