HBASE-20042 TestRegionServerAbort flakey; ADDENDUM, RETRY
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c677c300 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c677c300 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c677c300 Branch: refs/heads/HBASE-19397-branch-2 Commit: c677c30020778efd4134729c31c294bcd718e5f5 Parents: 92bb4db Author: Michael Stack <[email protected]> Authored: Wed Feb 21 15:26:21 2018 -0800 Committer: Michael Stack <[email protected]> Committed: Wed Feb 21 15:26:59 2018 -0800 ---------------------------------------------------------------------- .../hbase/regionserver/TestRegionServerAbort.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c677c300/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbort.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbort.java index 0c778fb..d5cbad0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbort.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerAbort.java @@ -144,21 +144,10 @@ public class TestRegionServerAbort { put.addColumn(FAMILY_BYTES, Bytes.toBytes("c"), new byte[]{}); put.setAttribute(StopBlockingRegionObserver.DO_ABORT, new byte[]{1}); - table.put(put); - // should have triggered an abort due to FileNotFoundException - - // verify that the regionserver is stopped - List<HRegion> regions = null; - do { - regions = cluster.findRegionsForTable(tableName); - if (regions != null && regions.size() > 0) { - break; - } - LOG.warn("Waiting on regions for {} to online"); - Threads.sleep(100); - } while(true); - + List<HRegion> regions = cluster.findRegionsForTable(tableName); HRegion firstRegion = cluster.findRegionsForTable(tableName).get(0); + table.put(put); + // Verify that the regionserver is stopped assertNotNull(firstRegion); assertNotNull(firstRegion.getRegionServerServices()); LOG.info("isAborted = " + firstRegion.getRegionServerServices().isAborted());
