HBASE-15206 Fix flakey testSplitDaughtersNotInMeta test (Huaxiang Sun)

This commit is contained in:
Jonathan M Hsieh 2016-02-02 16:38:10 -08:00
parent ed46591f30
commit ecf3efadc0
1 changed files with 5 additions and 0 deletions

View File

@ -938,6 +938,10 @@ public class TestHBaseFsckOneRS extends BaseTestHBaseFsck {
HRegionInfo hri = location.getRegionInfo(); HRegionInfo hri = location.getRegionInfo();
// Disable CatalogJanitor to prevent it from cleaning up the parent region
// after split.
admin.enableCatalogJanitor(false);
// do a regular split // do a regular split
byte[] regionName = location.getRegionInfo().getRegionName(); byte[] regionName = location.getRegionInfo().getRegionName();
admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM")); admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM"));
@ -995,6 +999,7 @@ public class TestHBaseFsckOneRS extends BaseTestHBaseFsck {
assertNoErrors(doFsck(conf, false)); //should be fixed by now assertNoErrors(doFsck(conf, false)); //should be fixed by now
} }
} finally { } finally {
admin.enableCatalogJanitor(true);
meta.close(); meta.close();
cleanupTable(table); cleanupTable(table);
} }