This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push: new 618d06e PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey 618d06e is described below commit 618d06e5b5fb81b792075f51fa52d922bb99598e Author: Istvan Toth <st...@apache.org> AuthorDate: Mon Sep 13 16:40:37 2021 +0200 PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey --- .../hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java index 36b277c..5e9aaf2 100644 --- a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java +++ b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java @@ -29,7 +29,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -57,7 +56,6 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress; -import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.Indexer; @@ -68,6 +66,8 @@ import org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy; import org.apache.phoenix.query.BaseTest; import org.apache.phoenix.query.QueryConstants; import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; +import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap; import org.apache.phoenix.util.PropertiesUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.junit.BeforeClass; @@ -76,9 +76,6 @@ import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; -import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap; - @Category(NeedsOwnMiniClusterTest.class) public class WALRecoveryRegionPostOpenIT extends BaseTest { @@ -109,13 +106,13 @@ public class WALRecoveryRegionPostOpenIT extends BaseTest { serverProps.put(HConstants.HBASE_RPC_TIMEOUT_KEY, "10000"); serverProps.put(IndexWriterUtils.INDEX_WRITER_RPC_PAUSE, "5000"); serverProps.put("data.tx.snapshot.dir", "/tmp"); - serverProps.put("hbase.balancer.period", String.valueOf(Integer.MAX_VALUE)); serverProps.put(QueryServices.INDEX_FAILURE_HANDLING_REBUILD_ATTRIB, Boolean.FALSE.toString()); Map<String, String> clientProps = Maps.newHashMapWithExpectedSize(2); clientProps.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.FALSE.toString()); clientProps.put(QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB, Boolean.FALSE.toString()); NUM_SLAVES_BASE = 2; setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), new ReadOnlyProps(clientProps.entrySet().iterator())); + getUtility().getHBaseCluster().getMaster().balanceSwitch(false); } public static class IndexTableFailingRegionObserver extends SimpleRegionObserver {