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 2118F105BD for ; Wed, 18 Sep 2013 13:54:16 +0000 (UTC) Received: (qmail 29365 invoked by uid 500); 18 Sep 2013 13:54:15 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 29166 invoked by uid 500); 18 Sep 2013 13:54:13 -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 29159 invoked by uid 99); 18 Sep 2013 13:54:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 13:54:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Sep 2013 13:54:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DFD10238896F; Wed, 18 Sep 2013 13:53:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1524415 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java Date: Wed, 18 Sep 2013 13:53:50 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130918135350.DFD10238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tedyu Date: Wed Sep 18 13:53:50 2013 New Revision: 1524415 URL: http://svn.apache.org/r1524415 Log: HBASE-9564 Intermittent TestSimpleRpcScheduler#testHandlerIsolation failure Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java?rev=1524415&r1=1524414&r2=1524415&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java (original) +++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java Wed Sep 18 13:53:50 2013 @@ -38,6 +38,7 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.util.List; import java.util.Map; +import java.util.concurrent.CountDownLatch; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyObject; @@ -91,12 +92,16 @@ public class TestSimpleRpcScheduler { replicationTask, HConstants.REPLICATION_QOS); PriorityFunction qosFunction = mock(PriorityFunction.class); final Map handlerThreads = Maps.newHashMap(); + final CountDownLatch countDownLatch = new CountDownLatch(tasks.size()); Answer answerToRun = new Answer() { @Override public Void answer(InvocationOnMock invocationOnMock) throws Throwable { - handlerThreads.put( - (CallRunner) invocationOnMock.getMock(), - Thread.currentThread()); + synchronized (handlerThreads) { + handlerThreads.put( + (CallRunner) invocationOnMock.getMock(), + Thread.currentThread()); + } + countDownLatch.countDown(); return null; } }; @@ -119,6 +124,7 @@ public class TestSimpleRpcScheduler { scheduler.stop(); // Tests that these requests are handled by three distinct threads. + countDownLatch.await(); assertEquals(3, ImmutableSet.copyOf(handlerThreads.values()).size()); }