hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [3/4] hbase git commit: HBASE-15206 Fix flakey testSplitDaughtersNotInMeta test (Huaxiang Sun)
Date Wed, 03 Feb 2016 16:56:38 GMT
HBASE-15206 Fix flakey testSplitDaughtersNotInMeta test (Huaxiang Sun)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ecf3efad
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ecf3efad
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ecf3efad

Branch: refs/heads/hbase-12439
Commit: ecf3efadc04473c36a16d85baafe9d1e3ced355a
Parents: ed46591
Author: Jonathan M Hsieh <jmhsieh@apache.org>
Authored: Tue Feb 2 16:38:10 2016 -0800
Committer: Jonathan M Hsieh <jmhsieh@apache.org>
Committed: Tue Feb 2 16:41:43 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/ecf3efad/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
index c0939f3..b1864d2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
@@ -938,6 +938,10 @@ public class TestHBaseFsckOneRS extends BaseTestHBaseFsck {
 
         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"));
@@ -995,6 +999,7 @@ public class TestHBaseFsckOneRS extends BaseTestHBaseFsck {
         assertNoErrors(doFsck(conf, false)); //should be fixed by now
       }
     } finally {
+      admin.enableCatalogJanitor(true);
       meta.close();
       cleanupTable(table);
     }


Mime
View raw message