From 82773a8c6ed5e20545def8f26053032c4a7d792e Mon Sep 17 00:00:00 2001 From: stack Date: Mon, 6 Apr 2020 12:35:52 -0700 Subject: [PATCH] Revert "HBASE-24118 [Flakey Tests] TestCloseRegionWhileRSCrash" Reverting in favor of adding an @Ignore on this test until root cause of flakyness HBASE-24117 is addressed. This reverts commit 9985c06647ef7169b9940cd3b6b24c2ac6a322fc. --- .../assignment/TestCloseRegionWhileRSCrash.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestCloseRegionWhileRSCrash.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestCloseRegionWhileRSCrash.java index c0382e4d3f3..04e6930f138 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestCloseRegionWhileRSCrash.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestCloseRegionWhileRSCrash.java @@ -1,4 +1,4 @@ -/* +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -24,7 +24,9 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.ProcedureTestUtil; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.ServerManager; import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv; @@ -190,11 +192,10 @@ public class TestCloseRegionWhileRSCrash { // here we start a new master UTIL.getMiniHBaseCluster().startMaster(); t.join(); - // Make sure that the region is online, it may not be on the original target server, as we will - // set forceNewPlan to true if there is a server crash. - // DISABLED THIS CHECK. See HBASE-24117. - // try (Table table = UTIL.getConnection().getTable(TABLE_NAME)) { - // table.put(new Put(Bytes.toBytes(1)).addColumn(CF, Bytes.toBytes("cq"), Bytes.toBytes(1))); - // } + // Make sure that the region is online, it may not on the original target server, as we will set + // forceNewPlan to true if there is a server crash + try (Table table = UTIL.getConnection().getTable(TABLE_NAME)) { + table.put(new Put(Bytes.toBytes(1)).addColumn(CF, Bytes.toBytes("cq"), Bytes.toBytes(1))); + } } }