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 472DE200B8C for ; Fri, 19 Aug 2016 22:33:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 45BC2160AAB; Fri, 19 Aug 2016 20:33:24 +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 72F5F160ABD for ; Fri, 19 Aug 2016 22:33:23 +0200 (CEST) Received: (qmail 82508 invoked by uid 500); 19 Aug 2016 20:33:17 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 81947 invoked by uid 99); 19 Aug 2016 20:33:17 -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, 19 Aug 2016 20:33:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6455FE69A9; Fri, 19 Aug 2016 20:33:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Fri, 19 Aug 2016 20:33:31 -0000 Message-Id: <640fdab0a86342819aae52e9427f8e00@git.apache.org> In-Reply-To: <795842920a3e467cb067e36b1ae62fa4@git.apache.org> References: <795842920a3e467cb067e36b1ae62fa4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/50] [abbrv] hadoop git commit: HDFS-10641. TestBlockManager#testBlockReportQueueing fails intermittently. (Contributed by Daryn Sharp) archived-at: Fri, 19 Aug 2016 20:33:24 -0000 HDFS-10641. TestBlockManager#testBlockReportQueueing fails intermittently. (Contributed by Daryn Sharp) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4d4d95fd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4d4d95fd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4d4d95fd Branch: refs/heads/HDFS-7240 Commit: 4d4d95fdd5e1e985c16005adc45517cc8b549ae8 Parents: 9336a04 Author: Mingliang Liu Authored: Mon Aug 15 20:28:40 2016 -0700 Committer: Mingliang Liu Committed: Mon Aug 15 20:28:40 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/TestBlockManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d4d95fd/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java index 535acd7..1f58f99 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java @@ -1013,6 +1013,7 @@ public class TestBlockManager { final CyclicBarrier startBarrier = new CyclicBarrier(2); final CountDownLatch endLatch = new CountDownLatch(3); + final CountDownLatch doneLatch = new CountDownLatch(1); // create a task intended to block while processing, thus causing // the queue to backup. simulates how a full BR is processed. @@ -1020,7 +1021,7 @@ public class TestBlockManager { new Callable(){ @Override public Void call() throws IOException { - return bm.runBlockOp(new Callable() { + bm.runBlockOp(new Callable() { @Override public Void call() throws InterruptedException, BrokenBarrierException { @@ -1030,6 +1031,9 @@ public class TestBlockManager { return null; } }); + // signal that runBlockOp returned + doneLatch.countDown(); + return null; } }); @@ -1074,7 +1078,7 @@ public class TestBlockManager { startBarrier.await(1, TimeUnit.SECONDS); assertTrue(endLatch.await(1, TimeUnit.SECONDS)); assertEquals(0, bm.getBlockOpQueueLength()); - assertTrue(blockingOp.isDone()); + assertTrue(doneLatch.await(1, TimeUnit.SECONDS)); } finally { cluster.shutdown(); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org