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 d4a7fdc..0270bc9 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 @@ -49,6 +49,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.io.IOUtils; @@ -558,7 +559,9 @@ public class TestHBaseFsck { } } // If we reach here, then an exception was caught - if (fail) fail(); + if (fail) { + fail(); + } return null; } } @@ -568,8 +571,18 @@ public class TestHBaseFsck { service.shutdown(); //wait for 15 seconds, for both hbck calls finish service.awaitTermination(15, TimeUnit.SECONDS); - HBaseFsck h1 = hbck1.get(); - HBaseFsck h2 = hbck2.get(); + HBaseFsck h1 = null; + try { + h1 = hbck1.get(4, TimeUnit.SECONDS); + } catch (TimeoutException e) { + LOG.info("timed out getting h1"); + } + HBaseFsck h2 = null; + try { + h2 = hbck2.get(4, TimeUnit.SECONDS); + } catch (TimeoutException e) { + LOG.info("timed out getting h2"); + } // Make sure only one of the calls was successful assert(h1 == null || h2 == null); if (h1 != null) {