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 082c743..f21ddb3 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 @@ -62,6 +62,8 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs public static final String CALL_QUEUE_TYPE_FIFO_CONF_VALUE = "fifo"; public static final String CALL_QUEUE_TYPE_CONF_KEY = "hbase.ipc.server.callqueue.type"; public static final String CALL_QUEUE_TYPE_CONF_DEFAULT = CALL_QUEUE_TYPE_FIFO_CONF_VALUE; + public static final String CALL_QUEUE_TYPE_DEFAULT = CALL_QUEUE_TYPE_FIFO_CONF_VALUE; + ; /** max delay in msec used to bound the deprioritized requests */ public static final String QUEUE_MAX_CALL_DELAY_CONF_KEY @@ -96,8 +98,7 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs replicationExecutor.resizeQueues(conf); } - String callQueueType = conf.get(CALL_QUEUE_TYPE_CONF_KEY, - CALL_QUEUE_TYPE_DEADLINE_CONF_VALUE); + String callQueueType = conf.get(CALL_QUEUE_TYPE_CONF_KEY, CALL_QUEUE_TYPE_DEFAULT); if (isCodelQueueType(callQueueType)) { // update CoDel Scheduler tunables @@ -184,8 +185,7 @@ public class SimpleRpcScheduler extends RpcScheduler implements ConfigurationObs this.highPriorityLevel = highPriorityLevel; this.abortable = server; - String callQueueType = conf.get(CALL_QUEUE_TYPE_CONF_KEY, - CALL_QUEUE_TYPE_FIFO_CONF_VALUE); + String callQueueType = conf.get(CALL_QUEUE_TYPE_CONF_KEY, CALL_QUEUE_TYPE_DEFAULT); float callqReadShare = conf.getFloat(CALL_QUEUE_READ_SHARE_CONF_KEY, 0); float callqScanShare = conf.getFloat(CALL_QUEUE_SCAN_SHARE_CONF_KEY, 0);