[hbase] branch branch-1 updated: HBASE-21766 TestSimpleRpcScheduler is flaky (branch-1)

[apurtell]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1 by this push:
     new d3ce261  HBASE-21766 TestSimpleRpcScheduler is flaky (branch-1)
d3ce261 is described below

commit d3ce26101e4b6dd032126e18abc3bd7b3cf3f95b
Author: Andrew Purtell <apurt...@apache.org>
AuthorDate: Wed Jan 23 14:55:04 2019 -0800

    HBASE-21766 TestSimpleRpcScheduler is flaky (branch-1)
---
 .../test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
index 8ae1a2f..347b231 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java
@@ -39,7 +39,6 @@ import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadLocalRandom;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -374,6 +373,7 @@ public class TestSimpleRpcScheduler {
       when(putCall.getHeader()).thenReturn(putHead);
 
       assertTrue(scheduler.dispatch(putCallTask));
+      waitUntilQueueEmpty(scheduler);
 
       schedConf.setInt("hbase.ipc.server.max.callqueue.length", 0);
       scheduler.onConfigurationChange(schedConf);