Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 42197200D3B for ; Fri, 27 Oct 2017 08:13:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 40CF5160BF3; Fri, 27 Oct 2017 06:13:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8F3DA1609E5 for ; Fri, 27 Oct 2017 08:13:21 +0200 (CEST) Received: (qmail 55184 invoked by uid 500); 27 Oct 2017 06:13:20 -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 55175 invoked by uid 99); 27 Oct 2017 06:13:20 -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, 27 Oct 2017 06:13:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8CB5CDFAEB; Fri, 27 Oct 2017 06:13:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Message-Id: <8948daabfc5f4a498fce62c1562341d8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18905 addendum fix hanging TestFlushLifeCycleTracker Date: Fri, 27 Oct 2017 06:13:20 +0000 (UTC) archived-at: Fri, 27 Oct 2017 06:13:22 -0000 Repository: hbase Updated Branches: refs/heads/master 82b1c320f -> 090c10f2a HBASE-18905 addendum fix hanging TestFlushLifeCycleTracker Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/090c10f2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/090c10f2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/090c10f2 Branch: refs/heads/master Commit: 090c10f2a4df298e7778fb2792c8b65334db0916 Parents: 82b1c32 Author: zhangduo Authored: Fri Oct 27 10:56:21 2017 +0800 Committer: zhangduo Committed: Fri Oct 27 14:05:16 2017 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/TestFlushLifeCycleTracker.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/090c10f2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java index 04a32cc..7ef1f69 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushLifeCycleTracker.java @@ -45,7 +45,6 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -53,13 +52,12 @@ import org.junit.experimental.categories.Category; * Confirm that the function of FlushLifeCycleTracker is OK as we do not use it in our own code. */ @Category({ CoprocessorTests.class, MediumTests.class }) -@Ignore public class TestFlushLifeCycleTracker { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final TableName NAME = - TableName.valueOf(TestCompactionLifeCycleTracker.class.getSimpleName()); + TableName.valueOf(TestFlushLifeCycleTracker.class.getSimpleName()); private static final byte[] CF = Bytes.toBytes("CF"); @@ -116,11 +114,11 @@ public class TestFlushLifeCycleTracker { CountDownLatch arrive = ARRIVE; if (arrive != null) { arrive.countDown(); - } - try { - BLOCK.await(); - } catch (InterruptedException e) { - throw new InterruptedIOException(); + try { + BLOCK.await(); + } catch (InterruptedException e) { + throw new InterruptedIOException(); + } } } }