From 090c10f2a4df298e7778fb2792c8b65334db0916 Mon Sep 17 00:00:00 2001
From: zhangduo <zhangduo@apache.org>
Date: Fri, 27 Oct 2017 10:56:21 +0800
Subject: [PATCH] HBASE-18905 addendum fix hanging TestFlushLifeCycleTracker

---
 .../regionserver/TestFlushLifeCycleTracker.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java
index 04a32ccbd77..7ef1f690274 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java
@@ -45,7 +45,6 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -53,13 +52,12 @@ import org.junit.experimental.categories.Category;
  * Confirm that the function of FlushLifeCycleTracker is OK as we do not use it in our own code.
  */
 @Category({ CoprocessorTests.class, MediumTests.class })
-@Ignore
 public class TestFlushLifeCycleTracker {
 
   private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
 
   private static final TableName NAME =
-      TableName.valueOf(TestCompactionLifeCycleTracker.class.getSimpleName());
+      TableName.valueOf(TestFlushLifeCycleTracker.class.getSimpleName());
 
   private static final byte[] CF = Bytes.toBytes("CF");
 
@@ -116,11 +114,11 @@ public class TestFlushLifeCycleTracker {
       CountDownLatch arrive = ARRIVE;
       if (arrive != null) {
         arrive.countDown();
-      }
-      try {
-        BLOCK.await();
-      } catch (InterruptedException e) {
-        throw new InterruptedIOException();
+        try {
+          BLOCK.await();
+        } catch (InterruptedException e) {
+          throw new InterruptedIOException();
+        }
       }
     }
   }