From f365cb52649c54015957cbdcfe48b687b53f280f Mon Sep 17 00:00:00 2001 From: huaxiangsun Date: Mon, 30 Mar 2020 10:06:13 -0700 Subject: [PATCH] Revert "HBASE-24073 [flakey test] client.TestAsyncRegionAdminApi messed up compaction state. (#1378)" (#1386) This reverts commit d319ce8c6fb94c3433cb363ce0234144cbb18713. --- .../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 7463f7d227a3..bc05a82fd798 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 @@ private void compactionTest(final TableName tableName, final int flushes, 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 regions = new ArrayList<>(); TEST_UTIL