From a892c8baa433f5112aa186e8d28bf50e366c760d Mon Sep 17 00:00:00 2001 From: CHIA-PING TSAI Date: Thu, 9 Mar 2017 14:10:33 +0800 Subject: [PATCH] HBASE-17746 TestSimpleRpcScheduler.testCoDelScheduling is broken --- .../src/main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 2 +- .../test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 616f741..937abfe 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,7 +85,7 @@ 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.isCodelQueueType(callQueueType)) { callExecutor = new FastPathBalancedQueueRpcExecutor("deafult.FPBQ", handlerCount, maxQueueLength, priority, conf, server); } else { 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 04ac519..5e4520d 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 @@ -434,8 +434,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); schedConf.set(RpcExecutor.CALL_QUEUE_TYPE_CONF_KEY, -- 2.10.1 (Apple Git-78)