Repository: hbase Updated Branches: refs/heads/branch-1 dc84c7b9a -> 531598d67
HBASE-17746 TestSimpleRpcScheduler.testCoDelScheduling is broken Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/531598d6 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/531598d6 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/531598d6 Branch: refs/heads/branch-1 Commit: 531598d67f390b2d570d1cb6195b2e367222afa5 Parents: dc84c7b Author: Guanghao Zhang <[email protected]> Authored: Fri Mar 10 15:47:54 2017 +0800 Committer: Guanghao Zhang <[email protected]> Committed: Mon Mar 13 11:10:33 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 4 ++-- .../java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/531598d6/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java index 28b308f..698381c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java @@ -85,10 +85,10 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs callExecutor = new RWQueueRpcExecutor("deafult.RWQ", Math.max(2, handlerCount), maxQueueLength, priority, conf, server); } else { - if (RpcExecutor.isFifoQueueType(callQueueType)) { + if (RpcExecutor.isFifoQueueType(callQueueType) || RpcExecutor.isCodelQueueType(callQueueType)) { callExecutor = new FastPathBalancedQueueRpcExecutor("deafult.FPBQ", handlerCount, maxQueueLength, priority, conf, server); - } else { + } else { callExecutor = new BalancedQueueRpcExecutor("deafult.BQ", handlerCount, maxQueueLength, priority, conf, server); } http://git-wip-us.apache.org/repos/asf/hbase/blob/531598d6/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java ---------------------------------------------------------------------- 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 dd1288b..2fd203c 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 @@ -410,8 +410,7 @@ public class TestSimpleRpcScheduler { @Test public void testCoDelScheduling() throws Exception { CoDelEnvironmentEdge envEdge = new CoDelEnvironmentEdge(); - envEdge.threadNamePrefixs.add("RpcServer.CodelFPBQ.default.handler"); - envEdge.threadNamePrefixs.add("RpcServer.CodelRWQ.default.handler"); + envEdge.threadNamePrefixs.add("RpcServer.deafult.FPBQ.Codel.handler"); Configuration schedConf = HBaseConfiguration.create(); schedConf.setInt(RpcScheduler.IPC_SERVER_MAX_CALLQUEUE_LENGTH, 250);
