HBASE-21589 TestCleanupMetaWAL fails

This commit is contained in:
stack 2018-12-16 14:15:00 -08:00
parent ac0b3bb547
commit 68b5df0095
1 changed files with 4 additions and 3 deletions

View File

@ -66,10 +66,13 @@ public class TestCleanupMetaWAL {
.getRegionServer(TEST_UTIL.getMiniHBaseCluster().getServerWithMeta()); .getRegionServer(TEST_UTIL.getMiniHBaseCluster().getServerWithMeta());
TEST_UTIL.getAdmin() TEST_UTIL.getAdmin()
.move(RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(), null); .move(RegionInfoBuilder.FIRST_META_REGIONINFO.getEncodedNameAsBytes(), null);
LOG.info("KILL");
TEST_UTIL.getMiniHBaseCluster().killRegionServer(serverWithMeta.getServerName()); TEST_UTIL.getMiniHBaseCluster().killRegionServer(serverWithMeta.getServerName());
TEST_UTIL.waitFor(10000, () -> LOG.info("WAIT");
TEST_UTIL.waitFor(30000, () ->
TEST_UTIL.getMiniHBaseCluster().getMaster().getProcedures().stream() TEST_UTIL.getMiniHBaseCluster().getMaster().getProcedures().stream()
.filter(p -> p instanceof ServerCrashProcedure && p.isFinished()).count() > 0); .filter(p -> p instanceof ServerCrashProcedure && p.isFinished()).count() > 0);
LOG.info("DONE WAITING");
MasterFileSystem fs = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem(); MasterFileSystem fs = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();
Path walPath = new Path(fs.getWALRootDir(), HConstants.HREGION_LOGDIR_NAME); Path walPath = new Path(fs.getWALRootDir(), HConstants.HREGION_LOGDIR_NAME);
for (FileStatus status : FSUtils.listStatus(fs.getFileSystem(), walPath)) { for (FileStatus status : FSUtils.listStatus(fs.getFileSystem(), walPath)) {
@ -77,7 +80,5 @@ public class TestCleanupMetaWAL {
fail("Should not have splitting wal dir here:" + status); fail("Should not have splitting wal dir here:" + status);
} }
} }
} }
} }