hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject hbase git commit: HBASE-13732 TestHBaseFsck#testParallelWithRetriesHbck fails intermittently (Stephen Yuan Jiang, ADDENDUM for failing tests)
Date Wed, 03 Jun 2015 00:52:38 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 ce636701f -> 4e5535a15


HBASE-13732 TestHBaseFsck#testParallelWithRetriesHbck fails intermittently (Stephen Yuan Jiang,
ADDENDUM for failing tests)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4e5535a1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4e5535a1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4e5535a1

Branch: refs/heads/branch-1
Commit: 4e5535a156e885d1a8400346288abffe5294c869
Parents: ce63670
Author: Enis Soztutar <enis@apache.org>
Authored: Tue Jun 2 17:52:15 2015 -0700
Committer: Enis Soztutar <enis@apache.org>
Committed: Tue Jun 2 17:52:15 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/4e5535a1/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 149c8de..e7c37ba 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -432,7 +432,7 @@ public class HBaseFsck extends Configured implements Closeable {
       "hbase.hbck.lockfile.maxwaittime", DEFAULT_WAIT_FOR_LOCK_TIMEOUT);
     FSDataOutputStream stream = null;
     try {
-      stream = futureTask.get(30, TimeUnit.SECONDS);
+      stream = futureTask.get(timeoutInSeconds, TimeUnit.SECONDS);
     } catch (ExecutionException ee) {
       LOG.warn("Encountered exception when opening lock file", ee);
     } catch (InterruptedException ie) {


Mime
View raw message