You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/05/06 01:03:24 UTC
hbase git commit: HBASE-13591 Attempt to stabilize TestHBaseFsck
Repository: hbase
Updated Branches:
refs/heads/master 977f86743 -> 2e132db85
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/2e132db8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2e132db8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2e132db8
Branch: refs/heads/master
Commit: 2e132db85c49373b4086f4e4f7b39dcf2972f24f
Parents: 977f867
Author: Josh Elser <el...@apache.org>
Authored: Fri May 1 12:37:49 2015 -0400
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Tue May 5 15:37:19 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/2e132db8/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 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