You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by hu...@apache.org on 2020/03/30 16:59:49 UTC

[hbase] 01/01: Revert "HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1378)"

This is an automated email from the ASF dual-hosted git repository.

huaxiangsun pushed a commit to branch revert-1378-master.HBASE-24073
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 41f4429a22661ba9e42b67ca7a310d0669d68446
Author: huaxiangsun <hu...@apache.org>
AuthorDate: Mon Mar 30 09:59:39 2020 -0700

    Revert "HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1378)"
    
    This reverts commit d319ce8c6fb94c3433cb363ce0234144cbb18713.
---
 .../apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
index 7463f7d..bc05a82 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
@@ -372,18 +372,7 @@ public class TestAsyncRegionAdminApi extends TestAsyncAdminBase {
     byte[][] families =
         { family, Bytes.add(family, Bytes.toBytes("2")), Bytes.add(family, Bytes.toBytes("3")) };
     createTableWithDefaultConf(tableName, null, families);
-
-    byte[][] singleFamilyArray = { family };
-
-    // When singleFamily is true, only load data for the family being tested. This is to avoid
-    // the case that while major compaction is going on for the family, minor compaction could
-    // happen for other families at the same time (Two compaction threads long/short), thus
-    // pollute the compaction and store file numbers for the region.
-    if (singleFamily) {
-      loadData(tableName, singleFamilyArray, 3000, flushes);
-    } else {
-      loadData(tableName, families, 3000, flushes);
-    }
+    loadData(tableName, families, 3000, flushes);
 
     List<Region> regions = new ArrayList<>();
     TEST_UTIL