From b69b8aced6317f6017b9e81c3ca10d1a9a9d3dda Mon Sep 17 00:00:00 2001
From: Jonathan M Hsieh <jmhsieh@apache.org>
Date: Tue, 2 Feb 2016 16:40:48 -0800
Subject: [PATCH] HBASE-15206 Fix flakey testSplitDaughtersNotInMeta (Huaxiang
 Sun)

---
 .../java/org/apache/hadoop/hbase/util/TestHBaseFsck.java     | 5 +++++
 1 file changed, 5 insertions(+)

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 d008ef41e65..7ab4d5d5ef9 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);
     }