Repository: hbase Updated Branches: refs/heads/branch-1 1bf58675c -> b69b8aced
HBASE-15206 Fix flakey testSplitDaughtersNotInMeta (Huaxiang Sun) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b69b8ace Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b69b8ace Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b69b8ace Branch: refs/heads/branch-1 Commit: b69b8aced6317f6017b9e81c3ca10d1a9a9d3dda Parents: 1bf5867 Author: Jonathan M Hsieh <[email protected]> Authored: Tue Feb 2 16:40:48 2016 -0800 Committer: Jonathan M Hsieh <[email protected]> Committed: Tue Feb 2 16:58:05 2016 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b69b8ace/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index d008ef4..7ab4d5d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -1791,6 +1791,10 @@ public class TestHBaseFsck { HRegionInfo hri = location.getRegionInfo(); + // Disable CatalogJanitor to prevent it from cleaning up the parent region + // after split. + admin.enableCatalogJanitor(false); + // do a regular split byte[] regionName = location.getRegionInfo().getRegionName(); admin.splitRegion(location.getRegionInfo().getRegionName(), Bytes.toBytes("BM")); @@ -1839,6 +1843,7 @@ public class TestHBaseFsck { assertEquals(tbl.getStartKeys().length, SPLITS.length + 1 + 1); //SPLITS + 1 is # regions pre-split. assertNoErrors(doFsck(conf, false)); //should be fixed by now } finally { + admin.enableCatalogJanitor(true); meta.close(); cleanupTable(table); }
