From 4e5535a156e885d1a8400346288abffe5294c869 Mon Sep 17 00:00:00 2001
From: Enis Soztutar <enis@apache.org>
Date: Tue, 2 Jun 2015 17:52:15 -0700
Subject: [PATCH] HBASE-13732 TestHBaseFsck#testParallelWithRetriesHbck fails
 intermittently (Stephen Yuan Jiang, ADDENDUM for failing tests)

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

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 149c8de2974..e7c37ba64c2 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) {