Repository: hbase Updated Branches: refs/heads/branch-1.2 5cae3f66a -> 54e5ca7da
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/54e5ca7d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/54e5ca7d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/54e5ca7d Branch: refs/heads/branch-1.2 Commit: 54e5ca7da785fb62a57ec1fcd7750bfffd87dd76 Parents: 5cae3f6 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 17:01:35 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/54e5ca7d/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 111bf44..ac08466 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 @@ -1728,6 +1728,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")); @@ -1776,6 +1780,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); }
