You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/06/04 00:44:59 UTC
hbase git commit: HBASE-13831 TestHBaseFsck#testParallelHbck is flaky
against hadoop 2.6+ (Stephen Jiang)
Repository: hbase
Updated Branches:
refs/heads/branch-1 e8914f26d -> 86d30e0bf
HBASE-13831 TestHBaseFsck#testParallelHbck is flaky against hadoop 2.6+ (Stephen Jiang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/86d30e0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/86d30e0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/86d30e0b
Branch: refs/heads/branch-1
Commit: 86d30e0bfe62098415a41af2ae7f534488919f24
Parents: e8914f2
Author: tedyu <yu...@gmail.com>
Authored: Wed Jun 3 15:44:44 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Jun 3 15:44:44 2015 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/86d30e0b/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 c6314fd..4058534 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
@@ -583,6 +583,9 @@ public class TestHBaseFsck {
public HBaseFsck call(){
Configuration c = new Configuration(conf);
c.setInt("hbase.hbck.lockfile.attempts", 1);
+ // HBASE-13574 found that in HADOOP-2.6 and later, the create file would internally retry.
+ // To avoid flakiness of the test, set low max wait time.
+ c.setInt("hbase.hbck.lockfile.maxwaittime", 3);
try{
return doFsck(c, false);
} catch(Exception e){