You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2017/03/13 02:57:56 UTC

hbase git commit: HBASE-17746 TestSimpleRpcScheduler.testCoDelScheduling is broken

Repository: hbase
Updated Branches:
  refs/heads/master 4b541d638 -> 31bc94ae6


HBASE-17746 TestSimpleRpcScheduler.testCoDelScheduling is broken

Signed-off-by: Guanghao Zhang <zg...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/31bc94ae
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/31bc94ae
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/31bc94ae

Branch: refs/heads/master
Commit: 31bc94ae6094d02a73d347549e23bcbaff97838f
Parents: 4b541d6
Author: Chia-Ping Tsai <ch...@gmail.com>
Authored: Fri Mar 10 18:42:27 2017 +0800
Committer: Guanghao Zhang <zg...@apache.org>
Committed: Mon Mar 13 10:13:42 2017 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 2 +-
 .../java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/31bc94ae/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 616f741..d51d83b 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.isFifoQueueType(callQueueType) || RpcExecutor.isCodelQueueType(callQueueType)) {
         callExecutor = new FastPathBalancedQueueRpcExecutor("deafult.FPBQ", handlerCount,
             maxQueueLength, priority, conf, server);
       } else {

http://git-wip-us.apache.org/repos/asf/hbase/blob/31bc94ae/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 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,