--- ThriftServer-1.2.3.java 2016-08-30 03:27:14.000000000 +0800 +++ ThriftServer.java 2016-11-28 12:53:36.000000000 +0800 @@ -75,6 +75,7 @@ import org.apache.thrift.server.THsHaSer import org.apache.thrift.server.TNonblockingServer; import org.apache.thrift.server.TServer; import org.apache.thrift.server.TThreadPoolServer; +import org.apache.thrift.server.TThreadedSelectorServer; import org.apache.thrift.transport.TFramedTransport; import org.apache.thrift.transport.TNonblockingServerSocket; import org.apache.thrift.transport.TNonblockingServerTransport; @@ -141,6 +142,7 @@ public class ThriftServer { options.addOption("f", "framed", false, "Use framed transport"); options.addOption("c", "compact", false, "Use the compact protocol"); options.addOption("w", "workers", true, "How many worker threads to use."); + options.addOption("s", "selectors", true, "How many selector threads to use."); options.addOption("h", "help", false, "Print help information"); options.addOption(null, "infoport", true, "Port for web UI"); options.addOption("t", READ_TIMEOUT_OPTION, true, @@ -151,6 +153,7 @@ public class ThriftServer { servers.addOption( new Option("nonblocking", false, "Use the TNonblockingServer. This implies the framed transport.")); servers.addOption(new Option("hsha", false, "Use the THsHaServer. This implies the framed transport.")); + servers.addOption(new Option("selector", false, "Use the TThreadedSelectorServer. This implies the framed transport.")); servers.addOption(new Option("threadpool", false, "Use the TThreadPoolServer. This is the default.")); options.addOptionGroup(servers); return options; @@ -270,6 +273,28 @@ public class ThriftServer { return new THsHaServer(serverArgs); } + private static TServer getTThreadedSelectorServer(TProtocolFactory protocolFactory, + TProcessor processor, TTransportFactory transportFactory, + int workerThreads, int selectorThreads, + InetSocketAddress inetSocketAddress, ThriftMetrics metrics) + throws TTransportException { + TNonblockingServerTransport serverTransport = new TNonblockingServerSocket(inetSocketAddress); + log.info("starting HBase ThreadedSelector Thrift server on " + inetSocketAddress.toString()); + TThreadedSelectorServer.Args serverArgs = new TThreadedSelectorServer.Args(serverTransport); + if (workerThreads > 0) + serverArgs.workerThreads(workerThreads); + if (selectorThreads > 0) + serverArgs.selectorThreads(selectorThreads); + + ExecutorService executorService = createExecutor( + workerThreads, metrics); + serverArgs.executorService(executorService); + serverArgs.processor(processor); + serverArgs.transportFactory(transportFactory); + serverArgs.protocolFactory(protocolFactory); + return new TThreadedSelectorServer(serverArgs); + } + private static ExecutorService createExecutor( int workerThreads, ThriftMetrics metrics) { CallQueue callQueue = new CallQueue( @@ -336,6 +361,7 @@ public class ThriftServer { Configuration conf = HBaseConfiguration.create(); CommandLine cmd = parseArguments(conf, options, args); int workerThreads = 0; + int selectorThreads = 0; /** * This is to please both bin/hbase and bin/hbase-daemon. hbase-daemon provides "start" and "stop" arguments hbase @@ -417,6 +443,7 @@ public class ThriftServer { boolean nonblocking = cmd.hasOption("nonblocking"); boolean hsha = cmd.hasOption("hsha"); + boolean selector = cmd.hasOption("selector"); ThriftMetrics metrics = new ThriftMetrics(conf, ThriftMetrics.ThriftServerType.TWO); @@ -425,8 +452,10 @@ public class ThriftServer { implType = "nonblocking"; } else if (hsha) { implType = "hsha"; + } else if (selector) { + implType = "selector"; } - + conf.set("hbase.regionserver.thrift.server.type", implType); conf.setInt("hbase.regionserver.thrift.port", listenPort); registerFilters(conf); @@ -468,7 +497,10 @@ public class ThriftServer { if (cmd.hasOption("w")) { workerThreads = Integer.parseInt(cmd.getOptionValue("w")); } - + if (cmd.hasOption("s")) { + selectorThreads = Integer.parseInt(cmd.getOptionValue("s")); + } + // check for user-defined info server port setting, if so override the conf try { if (cmd.hasOption("infoport")) { @@ -504,6 +536,13 @@ public class ThriftServer { workerThreads, inetSocketAddress, metrics); + } else if (selector) { + server = getTThreadedSelectorServer(protocolFactory, + processor, + transportFactory, + workerThreads, selectorThreads, + inetSocketAddress, + metrics); } else { server = getTThreadPoolServer(protocolFactory, processor,