PHOENIX-1676 Set priority of Index Updates correctly, fix IndexQosIT
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f4180fa4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f4180fa4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f4180fa4 Branch: refs/heads/4.x-HBase-1.x Commit: f4180fa40e26c685bfbf1b59cf4385f9b0e713e9 Parents: 8b0591e Author: Thomas <tdsi...@salesforce.com> Authored: Mon Mar 23 22:51:53 2015 -0700 Committer: Thomas <tdsi...@salesforce.com> Committed: Mon Mar 23 22:54:56 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/index/IndexQosIT.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f4180fa4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexQosIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexQosIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexQosIT.java index 7338b40..9558bcb 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexQosIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexQosIT.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Properties; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; @@ -36,13 +37,14 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.ipc.BalancedQueueRpcExecutor; import org.apache.hadoop.hbase.ipc.CallRunner; import org.apache.hadoop.hbase.ipc.PhoenixIndexRpcScheduler; +import org.apache.hadoop.hbase.ipc.PriorityFunction; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; import org.apache.hadoop.hbase.ipc.RpcExecutor; import org.apache.hadoop.hbase.ipc.RpcScheduler; import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.regionserver.HRegionServer; -import org.apache.hadoop.hbase.regionserver.RegionServerServices; +import org.apache.hadoop.hbase.regionserver.RSRpcServices; import org.apache.hadoop.hbase.util.Bytes; import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest; import org.apache.phoenix.hbase.index.IndexQosRpcControllerFactory; @@ -82,8 +84,8 @@ public class IndexQosIT extends BaseTest { */ public static class TestPhoenixIndexRpcSchedulerFactory extends PhoenixIndexRpcSchedulerFactory { @Override - public RpcScheduler create(Configuration conf, RegionServerServices services) { - PhoenixIndexRpcScheduler phoenixIndexRpcScheduler = (PhoenixIndexRpcScheduler)super.create(conf, services); + public RpcScheduler create(Configuration conf, PriorityFunction priorityFunction, Abortable abortable) { + PhoenixIndexRpcScheduler phoenixIndexRpcScheduler = (PhoenixIndexRpcScheduler)super.create(conf, priorityFunction, abortable); phoenixIndexRpcScheduler.setExecutorForTesting(spyRpcExecutor); return phoenixIndexRpcScheduler; } @@ -93,7 +95,7 @@ public class IndexQosIT extends BaseTest { public void doSetup() throws Exception { conf = HBaseConfiguration.create(); setUpConfigForMiniCluster(conf); - conf.set(HRegionServer.REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS, + conf.set(RSRpcServices.REGION_SERVER_RPC_SCHEDULER_FACTORY_CLASS, TestPhoenixIndexRpcSchedulerFactory.class.getName()); conf.set(RpcControllerFactory.CUSTOM_CONTROLLER_CONF_KEY, IndexQosRpcControllerFactory.class.getName()); util = new HBaseTestingUtility(conf);
