From 51f8b0f415bd9fd4dc664cdfc096e728b4bfa5c2 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Wed, 10 Apr 2019 11:58:08 +0800
Subject: [PATCH] HBASE-22198 Fix flakey TestAsyncTableGetMultiThreaded

---
 .../TestAsyncTableGetMultiThreaded.java       | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
index 19dc05c2097f..48aba069c319 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
@@ -21,6 +21,7 @@
 import static org.apache.hadoop.hbase.master.LoadBalancer.TABLES_ON_MASTER;
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,7 +35,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -55,6 +55,8 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Will split the table, and move region randomly when testing.
@@ -64,7 +66,9 @@ public class TestAsyncTableGetMultiThreaded {
 
   @ClassRule
   public static final HBaseClassTestRule CLASS_RULE =
-      HBaseClassTestRule.forClass(TestAsyncTableGetMultiThreaded.class);
+    HBaseClassTestRule.forClass(TestAsyncTableGetMultiThreaded.class);
+
+  private static final Logger LOG = LoggerFactory.getLogger(TestAsyncTableGetMultiThreaded.class);
 
   private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
 
@@ -155,12 +159,23 @@ public String explainFailure() throws Exception {
 
       for (HRegion region : TEST_UTIL.getHBaseCluster().getRegions(TABLE_NAME)) {
         region.compact(true);
-
-        //Waiting for compaction to complete and references are cleaned up
+      }
+      for (HRegion region : TEST_UTIL.getHBaseCluster().getRegions(TABLE_NAME)) {
+        // Waiting for compaction to complete and references are cleaned up
         RetryCounter retrier = new RetryCounter(30, 1, TimeUnit.SECONDS);
-        while (CompactionState.NONE != admin
-            .getCompactionStateForRegion(region.getRegionInfo().getRegionName())
-            && retrier.shouldRetry()) {
+        for (;;) {
+          try {
+            if (admin.getCompactionStateForRegion(
+              region.getRegionInfo().getRegionName()) == CompactionState.NONE) {
+              break;
+            }
+          } catch (IOException e) {
+            LOG.warn("Failed to query");
+          }
+          if (!retrier.shouldRetry()) {
+            throw new IOException("Can not finish compaction in time after attempt " +
+              retrier.getAttemptTimes() + " times");
+          }
           retrier.sleepUntilNextRetry();
         }
         region.getStores().get(0).closeAndArchiveCompactedFiles();