Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1127B18854 for ; Wed, 3 Feb 2016 01:04:23 +0000 (UTC) Received: (qmail 24050 invoked by uid 500); 3 Feb 2016 01:03:48 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 24010 invoked by uid 500); 3 Feb 2016 01:03:48 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 23997 invoked by uid 99); 3 Feb 2016 01:03:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Feb 2016 01:03:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CB74DFC88; Wed, 3 Feb 2016 01:03:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jmhsieh@apache.org To: commits@hbase.apache.org Message-Id: <774ae43272c94cdc890ab89b15ade438@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15206 Fix flakey testSplitDaughtersNotInMeta (Huaxiang Sun) Date: Wed, 3 Feb 2016 01:03:48 +0000 (UTC) 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 Authored: Tue Feb 2 16:40:48 2016 -0800 Committer: Jonathan M Hsieh 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); }