hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject hbase git commit: HBASE-15206 Fix flakey testSplitDaughtersNotInMeta (Huaxiang Sun)
Date Wed, 03 Feb 2016 01:03:48 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 5041485aa -> 0ca1cac29


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/0ca1cac2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0ca1cac2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0ca1cac2

Branch: refs/heads/branch-1.1
Commit: 0ca1cac29a2bc3c5b9a0af78897588b5efbd6a01
Parents: 5041485
Author: Jonathan M Hsieh <jmhsieh@apache.org>
Authored: Tue Feb 2 16:40:48 2016 -0800
Committer: Jonathan M Hsieh <jmhsieh@apache.org>
Committed: Tue Feb 2 17:02:11 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/0ca1cac2/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 8cae32b..04ee249 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
@@ -1729,6 +1729,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"));
@@ -1777,6 +1781,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);
     }


Mime
View raw message