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 1C0EA1868B for ; Fri, 2 Oct 2015 20:31:52 +0000 (UTC) Received: (qmail 44753 invoked by uid 500); 2 Oct 2015 20:31:52 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 44712 invoked by uid 500); 2 Oct 2015 20:31:51 -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 44703 invoked by uid 99); 2 Oct 2015 20:31:51 -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; Fri, 02 Oct 2015 20:31:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8FFFE0044; Fri, 2 Oct 2015 20:31:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Date: Fri, 02 Oct 2015 20:31:51 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] hbase git commit: HBASE-14327 TestIOFencing#testFencingAroundCompactionAfterWALSync is flaky (Heng Chen) Repository: hbase Updated Branches: refs/heads/branch-1.0 dfc61c6ec -> bda54c5c6 HBASE-14327 TestIOFencing#testFencingAroundCompactionAfterWALSync is flaky (Heng Chen) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0cc5a5d8 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0cc5a5d8 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0cc5a5d8 Branch: refs/heads/branch-1.0 Commit: 0cc5a5d8cffd901c7e0883f24da4e6e808aefb39 Parents: dfc61c6 Author: stack Authored: Fri Sep 4 10:27:49 2015 -0700 Committer: stack Committed: Fri Oct 2 13:31:26 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/TestIOFencing.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0cc5a5d8/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java index 48feb03..6414be7 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java @@ -315,6 +315,12 @@ public class TestIOFencing { newRegion = (CompactionBlockerRegion)newServer.getOnlineRegion(REGION_NAME); + // After compaction of old region finishes on the server that was going down, make sure that + // all the files we expect are still working when region is up in new location. + FileSystem fs = newRegion.getFilesystem(); + for (String f: newRegion.getStoreFileList(new byte [][] {FAMILY})) { + assertTrue("After compaction, does not exist: " + f, fs.exists(new Path(f))); + } LOG.info("Allowing compaction to proceed"); compactingRegion.allowCompactions(); while (compactingRegion.compactCount == 0) { @@ -323,12 +329,7 @@ public class TestIOFencing { // The server we killed stays up until the compaction that was started before it was killed completes. In logs // you should see the old regionserver now going down. LOG.info("Compaction finished"); - // After compaction of old region finishes on the server that was going down, make sure that - // all the files we expect are still working when region is up in new location. - FileSystem fs = newRegion.getFilesystem(); - for (String f: newRegion.getStoreFileList(new byte [][] {FAMILY})) { - assertTrue("After compaction, does not exist: " + f, fs.exists(new Path(f))); - } + // If we survive the split keep going... // Now we make sure that the region isn't totally confused. Load up more rows. TEST_UTIL.loadNumericRows(table, FAMILY, FIRST_BATCH_COUNT, FIRST_BATCH_COUNT + SECOND_BATCH_COUNT);