http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html index 3cafa7c..05ee7d2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.KVScannerComparator.html @@ -232,8 +232,8 @@ <span class="sourceLineNo">224</span> this.current.close();<a name="line.224"></a> <span class="sourceLineNo">225</span> }<a name="line.225"></a> <span class="sourceLineNo">226</span> if (this.heap != null) {<a name="line.226"></a> -<span class="sourceLineNo">227</span> KeyValueScanner scanner;<a name="line.227"></a> -<span class="sourceLineNo">228</span> while ((scanner = this.heap.poll()) != null) {<a name="line.228"></a> +<span class="sourceLineNo">227</span> // Order of closing the scanners shouldn't matter here, so simply iterate and close them.<a name="line.227"></a> +<span class="sourceLineNo">228</span> for (KeyValueScanner scanner : heap) {<a name="line.228"></a> <span class="sourceLineNo">229</span> scanner.close();<a name="line.229"></a> <span class="sourceLineNo">230</span> }<a name="line.230"></a> <span class="sourceLineNo">231</span> }<a name="line.231"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.html index 3cafa7c..05ee7d2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/KeyValueHeap.html @@ -232,8 +232,8 @@ <span class="sourceLineNo">224</span> this.current.close();<a name="line.224"></a> <span class="sourceLineNo">225</span> }<a name="line.225"></a> <span class="sourceLineNo">226</span> if (this.heap != null) {<a name="line.226"></a> -<span class="sourceLineNo">227</span> KeyValueScanner scanner;<a name="line.227"></a> -<span class="sourceLineNo">228</span> while ((scanner = this.heap.poll()) != null) {<a name="line.228"></a> +<span class="sourceLineNo">227</span> // Order of closing the scanners shouldn't matter here, so simply iterate and close them.<a name="line.227"></a> +<span class="sourceLineNo">228</span> for (KeyValueScanner scanner : heap) {<a name="line.228"></a> <span class="sourceLineNo">229</span> scanner.close();<a name="line.229"></a> <span class="sourceLineNo">230</span> }<a name="line.230"></a> <span class="sourceLineNo">231</span> }<a name="line.231"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.html index 47c27f1..d7d35b7 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/ReversedRegionScannerImpl.html @@ -30,13 +30,13 @@ <span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a> <span class="sourceLineNo">023</span><a name="line.23"></a> <span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Cell;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.25"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.DoNotRetryIOException;<a name="line.25"></a> <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a> <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a> <span class="sourceLineNo">032</span><a name="line.32"></a> <span class="sourceLineNo">033</span>/**<a name="line.33"></a> <span class="sourceLineNo">034</span> * ReversibleRegionScannerImpl extends from RegionScannerImpl, and is used to<a name="line.34"></a> @@ -61,37 +61,36 @@ <span class="sourceLineNo">053</span> List<KeyValueScanner> joinedScanners, HRegion region) throws IOException {<a name="line.53"></a> <span class="sourceLineNo">054</span> this.storeHeap = new ReversedKeyValueHeap(scanners, comparator);<a name="line.54"></a> <span class="sourceLineNo">055</span> if (!joinedScanners.isEmpty()) {<a name="line.55"></a> -<span class="sourceLineNo">056</span> this.joinedHeap = new ReversedKeyValueHeap(joinedScanners,<a name="line.56"></a> -<span class="sourceLineNo">057</span> comparator);<a name="line.57"></a> -<span class="sourceLineNo">058</span> }<a name="line.58"></a> -<span class="sourceLineNo">059</span> }<a name="line.59"></a> -<span class="sourceLineNo">060</span><a name="line.60"></a> -<span class="sourceLineNo">061</span> @Override<a name="line.61"></a> -<span class="sourceLineNo">062</span> protected boolean shouldStop(Cell currentRowCell) {<a name="line.62"></a> -<span class="sourceLineNo">063</span> if (currentRowCell == null) {<a name="line.63"></a> -<span class="sourceLineNo">064</span> return true;<a name="line.64"></a> -<span class="sourceLineNo">065</span> }<a name="line.65"></a> -<span class="sourceLineNo">066</span> if (stopRow == null || Bytes.equals(stopRow, HConstants.EMPTY_START_ROW)) {<a name="line.66"></a> -<span class="sourceLineNo">067</span> return false;<a name="line.67"></a> -<span class="sourceLineNo">068</span> }<a name="line.68"></a> -<span class="sourceLineNo">069</span> int c = comparator.compareRows(currentRowCell, stopRow, 0, stopRow.length);<a name="line.69"></a> -<span class="sourceLineNo">070</span> return c < 0 || (c == 0 && !includeStopRow);<a name="line.70"></a> -<span class="sourceLineNo">071</span> }<a name="line.71"></a> -<span class="sourceLineNo">072</span><a name="line.72"></a> -<span class="sourceLineNo">073</span> @Override<a name="line.73"></a> -<span class="sourceLineNo">074</span> protected boolean nextRow(ScannerContext scannerContext, Cell curRowCell)<a name="line.74"></a> -<span class="sourceLineNo">075</span> throws IOException {<a name="line.75"></a> -<span class="sourceLineNo">076</span> assert super.joinedContinuationRow == null : "Trying to go to next row during joinedHeap read.";<a name="line.76"></a> -<span class="sourceLineNo">077</span> this.storeHeap.seekToPreviousRow(PrivateCellUtil.createFirstOnRow(curRowCell));<a name="line.77"></a> -<span class="sourceLineNo">078</span> resetFilters();<a name="line.78"></a> -<span class="sourceLineNo">079</span> // Calling the hook in CP which allows it to do a fast forward<a name="line.79"></a> -<span class="sourceLineNo">080</span> if (this.region.getCoprocessorHost() != null) {<a name="line.80"></a> -<span class="sourceLineNo">081</span> return this.region.getCoprocessorHost().postScannerFilterRow(this, curRowCell);<a name="line.81"></a> -<span class="sourceLineNo">082</span> }<a name="line.82"></a> -<span class="sourceLineNo">083</span> return true;<a name="line.83"></a> -<span class="sourceLineNo">084</span> }<a name="line.84"></a> -<span class="sourceLineNo">085</span><a name="line.85"></a> -<span class="sourceLineNo">086</span>}<a name="line.86"></a> +<span class="sourceLineNo">056</span> throw new DoNotRetryIOException("Reverse scan with loading CFs on demand is not supported");<a name="line.56"></a> +<span class="sourceLineNo">057</span> }<a name="line.57"></a> +<span class="sourceLineNo">058</span> }<a name="line.58"></a> +<span class="sourceLineNo">059</span><a name="line.59"></a> +<span class="sourceLineNo">060</span> @Override<a name="line.60"></a> +<span class="sourceLineNo">061</span> protected boolean shouldStop(Cell currentRowCell) {<a name="line.61"></a> +<span class="sourceLineNo">062</span> if (currentRowCell == null) {<a name="line.62"></a> +<span class="sourceLineNo">063</span> return true;<a name="line.63"></a> +<span class="sourceLineNo">064</span> }<a name="line.64"></a> +<span class="sourceLineNo">065</span> if (stopRow == null || Bytes.equals(stopRow, HConstants.EMPTY_START_ROW)) {<a name="line.65"></a> +<span class="sourceLineNo">066</span> return false;<a name="line.66"></a> +<span class="sourceLineNo">067</span> }<a name="line.67"></a> +<span class="sourceLineNo">068</span> int c = comparator.compareRows(currentRowCell, stopRow, 0, stopRow.length);<a name="line.68"></a> +<span class="sourceLineNo">069</span> return c < 0 || (c == 0 && !includeStopRow);<a name="line.69"></a> +<span class="sourceLineNo">070</span> }<a name="line.70"></a> +<span class="sourceLineNo">071</span><a name="line.71"></a> +<span class="sourceLineNo">072</span> @Override<a name="line.72"></a> +<span class="sourceLineNo">073</span> protected boolean nextRow(ScannerContext scannerContext, Cell curRowCell)<a name="line.73"></a> +<span class="sourceLineNo">074</span> throws IOException {<a name="line.74"></a> +<span class="sourceLineNo">075</span> assert super.joinedContinuationRow == null : "Trying to go to next row during joinedHeap read.";<a name="line.75"></a> +<span class="sourceLineNo">076</span> this.storeHeap.seekToPreviousRow(PrivateCellUtil.createFirstOnRow(curRowCell));<a name="line.76"></a> +<span class="sourceLineNo">077</span> resetFilters();<a name="line.77"></a> +<span class="sourceLineNo">078</span> // Calling the hook in CP which allows it to do a fast forward<a name="line.78"></a> +<span class="sourceLineNo">079</span> if (this.region.getCoprocessorHost() != null) {<a name="line.79"></a> +<span class="sourceLineNo">080</span> return this.region.getCoprocessorHost().postScannerFilterRow(this, curRowCell);<a name="line.80"></a> +<span class="sourceLineNo">081</span> }<a name="line.81"></a> +<span class="sourceLineNo">082</span> return true;<a name="line.82"></a> +<span class="sourceLineNo">083</span> }<a name="line.83"></a> +<span class="sourceLineNo">084</span><a name="line.84"></a> +<span class="sourceLineNo">085</span>}<a name="line.85"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html index 1e76aae..b00faf2 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift/ThriftServer.html @@ -26,232 +26,220 @@ <span class="sourceLineNo">018</span><a name="line.18"></a> <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.thrift;<a name="line.19"></a> <span class="sourceLineNo">020</span><a name="line.20"></a> -<span class="sourceLineNo">021</span>import java.util.Arrays;<a name="line.21"></a> -<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a> -<span class="sourceLineNo">023</span><a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.http.InfoServer;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.thrift.ThriftServerRunner.ImplType;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.VersionInfo;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.util.Shell.ExitCodeException;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.slf4j.Logger;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.slf4j.LoggerFactory;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLineParser;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.PosixParser;<a name="line.38"></a> -<span class="sourceLineNo">039</span><a name="line.39"></a> -<span class="sourceLineNo">040</span>/**<a name="line.40"></a> -<span class="sourceLineNo">041</span> * ThriftServer- this class starts up a Thrift server which implements the<a name="line.41"></a> -<span class="sourceLineNo">042</span> * Hbase API specified in the Hbase.thrift IDL file. The server runs in an<a name="line.42"></a> -<span class="sourceLineNo">043</span> * independent process.<a name="line.43"></a> -<span class="sourceLineNo">044</span> */<a name="line.44"></a> -<span class="sourceLineNo">045</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.45"></a> -<span class="sourceLineNo">046</span>public class ThriftServer {<a name="line.46"></a> -<span class="sourceLineNo">047</span><a name="line.47"></a> -<span class="sourceLineNo">048</span> private static final Logger LOG = LoggerFactory.getLogger(ThriftServer.class);<a name="line.48"></a> -<span class="sourceLineNo">049</span><a name="line.49"></a> -<span class="sourceLineNo">050</span> private static final String MIN_WORKERS_OPTION = "minWorkers";<a name="line.50"></a> -<span class="sourceLineNo">051</span> private static final String MAX_WORKERS_OPTION = "workers";<a name="line.51"></a> -<span class="sourceLineNo">052</span> private static final String MAX_QUEUE_SIZE_OPTION = "queue";<a name="line.52"></a> -<span class="sourceLineNo">053</span> private static final String KEEP_ALIVE_SEC_OPTION = "keepAliveSec";<a name="line.53"></a> -<span class="sourceLineNo">054</span> static final String BIND_OPTION = "bind";<a name="line.54"></a> -<span class="sourceLineNo">055</span> static final String COMPACT_OPTION = "compact";<a name="line.55"></a> -<span class="sourceLineNo">056</span> static final String FRAMED_OPTION = "framed";<a name="line.56"></a> -<span class="sourceLineNo">057</span> static final String PORT_OPTION = "port";<a name="line.57"></a> +<span class="sourceLineNo">021</span>import org.apache.hadoop.conf.Configuration;<a name="line.21"></a> +<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.http.InfoServer;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.thrift.ThriftServerRunner.ImplType;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.VersionInfo;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.hadoop.util.Shell.ExitCodeException;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.slf4j.Logger;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.slf4j.LoggerFactory;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLineParser;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.DefaultParser;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a name="line.35"></a> +<span class="sourceLineNo">036</span><a name="line.36"></a> +<span class="sourceLineNo">037</span>/**<a name="line.37"></a> +<span class="sourceLineNo">038</span> * ThriftServer- this class starts up a Thrift server which implements the<a name="line.38"></a> +<span class="sourceLineNo">039</span> * Hbase API specified in the Hbase.thrift IDL file. The server runs in an<a name="line.39"></a> +<span class="sourceLineNo">040</span> * independent process.<a name="line.40"></a> +<span class="sourceLineNo">041</span> */<a name="line.41"></a> +<span class="sourceLineNo">042</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a name="line.42"></a> +<span class="sourceLineNo">043</span>public class ThriftServer {<a name="line.43"></a> +<span class="sourceLineNo">044</span><a name="line.44"></a> +<span class="sourceLineNo">045</span> private static final Logger LOG = LoggerFactory.getLogger(ThriftServer.class);<a name="line.45"></a> +<span class="sourceLineNo">046</span><a name="line.46"></a> +<span class="sourceLineNo">047</span> private static final String MIN_WORKERS_OPTION = "minWorkers";<a name="line.47"></a> +<span class="sourceLineNo">048</span> private static final String MAX_WORKERS_OPTION = "workers";<a name="line.48"></a> +<span class="sourceLineNo">049</span> private static final String MAX_QUEUE_SIZE_OPTION = "queue";<a name="line.49"></a> +<span class="sourceLineNo">050</span> private static final String KEEP_ALIVE_SEC_OPTION = "keepAliveSec";<a name="line.50"></a> +<span class="sourceLineNo">051</span> static final String BIND_OPTION = "bind";<a name="line.51"></a> +<span class="sourceLineNo">052</span> static final String COMPACT_OPTION = "compact";<a name="line.52"></a> +<span class="sourceLineNo">053</span> static final String FRAMED_OPTION = "framed";<a name="line.53"></a> +<span class="sourceLineNo">054</span> static final String PORT_OPTION = "port";<a name="line.54"></a> +<span class="sourceLineNo">055</span><a name="line.55"></a> +<span class="sourceLineNo">056</span> private static final String DEFAULT_BIND_ADDR = "0.0.0.0";<a name="line.56"></a> +<span class="sourceLineNo">057</span> private static final int DEFAULT_LISTEN_PORT = 9090;<a name="line.57"></a> <span class="sourceLineNo">058</span><a name="line.58"></a> -<span class="sourceLineNo">059</span> private static final String DEFAULT_BIND_ADDR = "0.0.0.0";<a name="line.59"></a> -<span class="sourceLineNo">060</span> private static final int DEFAULT_LISTEN_PORT = 9090;<a name="line.60"></a> +<span class="sourceLineNo">059</span> private Configuration conf;<a name="line.59"></a> +<span class="sourceLineNo">060</span> ThriftServerRunner serverRunner;<a name="line.60"></a> <span class="sourceLineNo">061</span><a name="line.61"></a> -<span class="sourceLineNo">062</span> private Configuration conf;<a name="line.62"></a> -<span class="sourceLineNo">063</span> ThriftServerRunner serverRunner;<a name="line.63"></a> -<span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> private InfoServer infoServer;<a name="line.65"></a> -<span class="sourceLineNo">066</span><a name="line.66"></a> -<span class="sourceLineNo">067</span> private static final String READ_TIMEOUT_OPTION = "readTimeout";<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> //<a name="line.69"></a> -<span class="sourceLineNo">070</span> // Main program and support routines<a name="line.70"></a> -<span class="sourceLineNo">071</span> //<a name="line.71"></a> -<span class="sourceLineNo">072</span><a name="line.72"></a> -<span class="sourceLineNo">073</span> public ThriftServer(Configuration conf) {<a name="line.73"></a> -<span class="sourceLineNo">074</span> this.conf = HBaseConfiguration.create(conf);<a name="line.74"></a> -<span class="sourceLineNo">075</span> }<a name="line.75"></a> -<span class="sourceLineNo">076</span><a name="line.76"></a> -<span class="sourceLineNo">077</span> private static void printUsageAndExit(Options options, int exitCode)<a name="line.77"></a> -<span class="sourceLineNo">078</span> throws ExitCodeException {<a name="line.78"></a> -<span class="sourceLineNo">079</span> HelpFormatter formatter = new HelpFormatter();<a name="line.79"></a> -<span class="sourceLineNo">080</span> formatter.printHelp("Thrift", null, options,<a name="line.80"></a> -<span class="sourceLineNo">081</span> "To start the Thrift server run 'hbase-daemon.sh start thrift'\n" +<a name="line.81"></a> -<span class="sourceLineNo">082</span> "To shutdown the thrift server run 'hbase-daemon.sh stop " +<a name="line.82"></a> -<span class="sourceLineNo">083</span> "thrift' or send a kill signal to the thrift server pid",<a name="line.83"></a> -<span class="sourceLineNo">084</span> true);<a name="line.84"></a> -<span class="sourceLineNo">085</span> throw new ExitCodeException(exitCode, "");<a name="line.85"></a> -<span class="sourceLineNo">086</span> }<a name="line.86"></a> -<span class="sourceLineNo">087</span><a name="line.87"></a> -<span class="sourceLineNo">088</span> /**<a name="line.88"></a> -<span class="sourceLineNo">089</span> * Start up or shuts down the Thrift server, depending on the arguments.<a name="line.89"></a> -<span class="sourceLineNo">090</span> * @param args the arguments to pass in when starting the Thrift server<a name="line.90"></a> -<span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> void doMain(final String[] args) throws Exception {<a name="line.92"></a> -<span class="sourceLineNo">093</span> processOptions(args);<a name="line.93"></a> -<span class="sourceLineNo">094</span> serverRunner = new ThriftServerRunner(conf);<a name="line.94"></a> -<span class="sourceLineNo">095</span><a name="line.95"></a> -<span class="sourceLineNo">096</span> // Put up info server.<a name="line.96"></a> -<span class="sourceLineNo">097</span> int port = conf.getInt("hbase.thrift.info.port", 9095);<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> if (port >= 0) {<a name="line.99"></a> -<span class="sourceLineNo">100</span> conf.setLong("startcode", System.currentTimeMillis());<a name="line.100"></a> -<span class="sourceLineNo">101</span> String a = conf.get("hbase.thrift.info.bindAddress", "0.0.0.0");<a name="line.101"></a> -<span class="sourceLineNo">102</span> infoServer = new InfoServer("thrift", a, port, false, conf);<a name="line.102"></a> -<span class="sourceLineNo">103</span> infoServer.setAttribute("hbase.conf", conf);<a name="line.103"></a> -<span class="sourceLineNo">104</span> infoServer.start();<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> serverRunner.run();<a name="line.107"></a> -<span class="sourceLineNo">108</span> }<a name="line.108"></a> -<span class="sourceLineNo">109</span><a name="line.109"></a> -<span class="sourceLineNo">110</span> /**<a name="line.110"></a> -<span class="sourceLineNo">111</span> * Parse the command line options to set parameters the conf.<a name="line.111"></a> -<span class="sourceLineNo">112</span> */<a name="line.112"></a> -<span class="sourceLineNo">113</span> private void processOptions(final String[] args) throws Exception {<a name="line.113"></a> -<span class="sourceLineNo">114</span> Options options = new Options();<a name="line.114"></a> -<span class="sourceLineNo">115</span> options.addOption("b", BIND_OPTION, true, "Address to bind " +<a name="line.115"></a> -<span class="sourceLineNo">116</span> "the Thrift server to. [default: " + DEFAULT_BIND_ADDR + "]");<a name="line.116"></a> -<span class="sourceLineNo">117</span> options.addOption("p", PORT_OPTION, true, "Port to bind to [default: " +<a name="line.117"></a> -<span class="sourceLineNo">118</span> DEFAULT_LISTEN_PORT + "]");<a name="line.118"></a> -<span class="sourceLineNo">119</span> options.addOption("f", FRAMED_OPTION, false, "Use framed transport");<a name="line.119"></a> -<span class="sourceLineNo">120</span> options.addOption("c", COMPACT_OPTION, false, "Use the compact protocol");<a name="line.120"></a> -<span class="sourceLineNo">121</span> options.addOption("h", "help", false, "Print help information");<a name="line.121"></a> -<span class="sourceLineNo">122</span> options.addOption(null, "infoport", true, "Port for web UI");<a name="line.122"></a> -<span class="sourceLineNo">123</span><a name="line.123"></a> -<span class="sourceLineNo">124</span> options.addOption("m", MIN_WORKERS_OPTION, true,<a name="line.124"></a> -<span class="sourceLineNo">125</span> "The minimum number of worker threads for " +<a name="line.125"></a> -<span class="sourceLineNo">126</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.126"></a> -<span class="sourceLineNo">127</span><a name="line.127"></a> -<span class="sourceLineNo">128</span> options.addOption("w", MAX_WORKERS_OPTION, true,<a name="line.128"></a> -<span class="sourceLineNo">129</span> "The maximum number of worker threads for " +<a name="line.129"></a> -<span class="sourceLineNo">130</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.130"></a> -<span class="sourceLineNo">131</span><a name="line.131"></a> -<span class="sourceLineNo">132</span> options.addOption("q", MAX_QUEUE_SIZE_OPTION, true,<a name="line.132"></a> -<span class="sourceLineNo">133</span> "The maximum number of queued requests in " +<a name="line.133"></a> -<span class="sourceLineNo">134</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.134"></a> -<span class="sourceLineNo">135</span><a name="line.135"></a> -<span class="sourceLineNo">136</span> options.addOption("k", KEEP_ALIVE_SEC_OPTION, true,<a name="line.136"></a> -<span class="sourceLineNo">137</span> "The amount of time in secods to keep a thread alive when idle in " +<a name="line.137"></a> -<span class="sourceLineNo">138</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.138"></a> -<span class="sourceLineNo">139</span><a name="line.139"></a> -<span class="sourceLineNo">140</span> options.addOption("t", READ_TIMEOUT_OPTION, true,<a name="line.140"></a> -<span class="sourceLineNo">141</span> "Amount of time in milliseconds before a server thread will timeout " +<a name="line.141"></a> -<span class="sourceLineNo">142</span> "waiting for client to send data on a connected socket. Currently, " +<a name="line.142"></a> -<span class="sourceLineNo">143</span> "only applies to TBoundedThreadPoolServer");<a name="line.143"></a> +<span class="sourceLineNo">062</span> private InfoServer infoServer;<a name="line.62"></a> +<span class="sourceLineNo">063</span><a name="line.63"></a> +<span class="sourceLineNo">064</span> private static final String READ_TIMEOUT_OPTION = "readTimeout";<a name="line.64"></a> +<span class="sourceLineNo">065</span><a name="line.65"></a> +<span class="sourceLineNo">066</span> //<a name="line.66"></a> +<span class="sourceLineNo">067</span> // Main program and support routines<a name="line.67"></a> +<span class="sourceLineNo">068</span> //<a name="line.68"></a> +<span class="sourceLineNo">069</span><a name="line.69"></a> +<span class="sourceLineNo">070</span> public ThriftServer(Configuration conf) {<a name="line.70"></a> +<span class="sourceLineNo">071</span> this.conf = HBaseConfiguration.create(conf);<a name="line.71"></a> +<span class="sourceLineNo">072</span> }<a name="line.72"></a> +<span class="sourceLineNo">073</span><a name="line.73"></a> +<span class="sourceLineNo">074</span> private static void printUsageAndExit(Options options, int exitCode)<a name="line.74"></a> +<span class="sourceLineNo">075</span> throws ExitCodeException {<a name="line.75"></a> +<span class="sourceLineNo">076</span> HelpFormatter formatter = new HelpFormatter();<a name="line.76"></a> +<span class="sourceLineNo">077</span> formatter.printHelp("Thrift", null, options,<a name="line.77"></a> +<span class="sourceLineNo">078</span> "To start the Thrift server run 'hbase-daemon.sh start thrift' or " +<a name="line.78"></a> +<span class="sourceLineNo">079</span> "'hbase thrift'\n" +<a name="line.79"></a> +<span class="sourceLineNo">080</span> "To shutdown the thrift server run 'hbase-daemon.sh stop " +<a name="line.80"></a> +<span class="sourceLineNo">081</span> "thrift' or send a kill signal to the thrift server pid",<a name="line.81"></a> +<span class="sourceLineNo">082</span> true);<a name="line.82"></a> +<span class="sourceLineNo">083</span> throw new ExitCodeException(exitCode, "");<a name="line.83"></a> +<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">085</span><a name="line.85"></a> +<span class="sourceLineNo">086</span> /**<a name="line.86"></a> +<span class="sourceLineNo">087</span> * Start up or shuts down the Thrift server, depending on the arguments.<a name="line.87"></a> +<span class="sourceLineNo">088</span> * @param args the arguments to pass in when starting the Thrift server<a name="line.88"></a> +<span class="sourceLineNo">089</span> */<a name="line.89"></a> +<span class="sourceLineNo">090</span> void doMain(final String[] args) throws Exception {<a name="line.90"></a> +<span class="sourceLineNo">091</span> processOptions(args);<a name="line.91"></a> +<span class="sourceLineNo">092</span> serverRunner = new ThriftServerRunner(conf);<a name="line.92"></a> +<span class="sourceLineNo">093</span><a name="line.93"></a> +<span class="sourceLineNo">094</span> // Put up info server.<a name="line.94"></a> +<span class="sourceLineNo">095</span> int port = conf.getInt("hbase.thrift.info.port", 9095);<a name="line.95"></a> +<span class="sourceLineNo">096</span><a name="line.96"></a> +<span class="sourceLineNo">097</span> if (port >= 0) {<a name="line.97"></a> +<span class="sourceLineNo">098</span> conf.setLong("startcode", System.currentTimeMillis());<a name="line.98"></a> +<span class="sourceLineNo">099</span> String a = conf.get("hbase.thrift.info.bindAddress", "0.0.0.0");<a name="line.99"></a> +<span class="sourceLineNo">100</span> infoServer = new InfoServer("thrift", a, port, false, conf);<a name="line.100"></a> +<span class="sourceLineNo">101</span> infoServer.setAttribute("hbase.conf", conf);<a name="line.101"></a> +<span class="sourceLineNo">102</span> infoServer.start();<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span><a name="line.104"></a> +<span class="sourceLineNo">105</span> serverRunner.run();<a name="line.105"></a> +<span class="sourceLineNo">106</span> }<a name="line.106"></a> +<span class="sourceLineNo">107</span><a name="line.107"></a> +<span class="sourceLineNo">108</span> /**<a name="line.108"></a> +<span class="sourceLineNo">109</span> * Parse the command line options to set parameters the conf.<a name="line.109"></a> +<span class="sourceLineNo">110</span> */<a name="line.110"></a> +<span class="sourceLineNo">111</span> private void processOptions(final String[] args) throws Exception {<a name="line.111"></a> +<span class="sourceLineNo">112</span> Options options = new Options();<a name="line.112"></a> +<span class="sourceLineNo">113</span> options.addOption("b", BIND_OPTION, true, "Address to bind " +<a name="line.113"></a> +<span class="sourceLineNo">114</span> "the Thrift server to. [default: " + DEFAULT_BIND_ADDR + "]");<a name="line.114"></a> +<span class="sourceLineNo">115</span> options.addOption("p", PORT_OPTION, true, "Port to bind to [default: " +<a name="line.115"></a> +<span class="sourceLineNo">116</span> DEFAULT_LISTEN_PORT + "]");<a name="line.116"></a> +<span class="sourceLineNo">117</span> options.addOption("f", FRAMED_OPTION, false, "Use framed transport");<a name="line.117"></a> +<span class="sourceLineNo">118</span> options.addOption("c", COMPACT_OPTION, false, "Use the compact protocol");<a name="line.118"></a> +<span class="sourceLineNo">119</span> options.addOption("h", "help", false, "Print help information");<a name="line.119"></a> +<span class="sourceLineNo">120</span> options.addOption(null, "infoport", true, "Port for web UI");<a name="line.120"></a> +<span class="sourceLineNo">121</span><a name="line.121"></a> +<span class="sourceLineNo">122</span> options.addOption("m", MIN_WORKERS_OPTION, true,<a name="line.122"></a> +<span class="sourceLineNo">123</span> "The minimum number of worker threads for " +<a name="line.123"></a> +<span class="sourceLineNo">124</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.124"></a> +<span class="sourceLineNo">125</span><a name="line.125"></a> +<span class="sourceLineNo">126</span> options.addOption("w", MAX_WORKERS_OPTION, true,<a name="line.126"></a> +<span class="sourceLineNo">127</span> "The maximum number of worker threads for " +<a name="line.127"></a> +<span class="sourceLineNo">128</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.128"></a> +<span class="sourceLineNo">129</span><a name="line.129"></a> +<span class="sourceLineNo">130</span> options.addOption("q", MAX_QUEUE_SIZE_OPTION, true,<a name="line.130"></a> +<span class="sourceLineNo">131</span> "The maximum number of queued requests in " +<a name="line.131"></a> +<span class="sourceLineNo">132</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.132"></a> +<span class="sourceLineNo">133</span><a name="line.133"></a> +<span class="sourceLineNo">134</span> options.addOption("k", KEEP_ALIVE_SEC_OPTION, true,<a name="line.134"></a> +<span class="sourceLineNo">135</span> "The amount of time in secods to keep a thread alive when idle in " +<a name="line.135"></a> +<span class="sourceLineNo">136</span> ImplType.THREAD_POOL.simpleClassName());<a name="line.136"></a> +<span class="sourceLineNo">137</span><a name="line.137"></a> +<span class="sourceLineNo">138</span> options.addOption("t", READ_TIMEOUT_OPTION, true,<a name="line.138"></a> +<span class="sourceLineNo">139</span> "Amount of time in milliseconds before a server thread will timeout " +<a name="line.139"></a> +<span class="sourceLineNo">140</span> "waiting for client to send data on a connected socket. Currently, " +<a name="line.140"></a> +<span class="sourceLineNo">141</span> "only applies to TBoundedThreadPoolServer");<a name="line.141"></a> +<span class="sourceLineNo">142</span><a name="line.142"></a> +<span class="sourceLineNo">143</span> options.addOptionGroup(ImplType.createOptionGroup());<a name="line.143"></a> <span class="sourceLineNo">144</span><a name="line.144"></a> -<span class="sourceLineNo">145</span> options.addOptionGroup(ImplType.createOptionGroup());<a name="line.145"></a> -<span class="sourceLineNo">146</span><a name="line.146"></a> -<span class="sourceLineNo">147</span> CommandLineParser parser = new PosixParser();<a name="line.147"></a> -<span class="sourceLineNo">148</span> CommandLine cmd = parser.parse(options, args);<a name="line.148"></a> -<span class="sourceLineNo">149</span><a name="line.149"></a> -<span class="sourceLineNo">150</span> // This is so complicated to please both bin/hbase and bin/hbase-daemon.<a name="line.150"></a> -<span class="sourceLineNo">151</span> // hbase-daemon provides "start" and "stop" arguments<a name="line.151"></a> -<span class="sourceLineNo">152</span> // hbase should print the help if no argument is provided<a name="line.152"></a> -<span class="sourceLineNo">153</span> List<String> commandLine = Arrays.asList(args);<a name="line.153"></a> -<span class="sourceLineNo">154</span> boolean stop = commandLine.contains("stop");<a name="line.154"></a> -<span class="sourceLineNo">155</span> boolean start = commandLine.contains("start");<a name="line.155"></a> -<span class="sourceLineNo">156</span> boolean invalidStartStop = (start && stop) || (!start && !stop);<a name="line.156"></a> -<span class="sourceLineNo">157</span> if (cmd.hasOption("help") || invalidStartStop) {<a name="line.157"></a> -<span class="sourceLineNo">158</span> if (invalidStartStop) {<a name="line.158"></a> -<span class="sourceLineNo">159</span> LOG.error("Exactly one of 'start' and 'stop' has to be specified");<a name="line.159"></a> -<span class="sourceLineNo">160</span> }<a name="line.160"></a> -<span class="sourceLineNo">161</span> printUsageAndExit(options, 1);<a name="line.161"></a> -<span class="sourceLineNo">162</span> }<a name="line.162"></a> -<span class="sourceLineNo">163</span><a name="line.163"></a> -<span class="sourceLineNo">164</span> // Get port to bind to<a name="line.164"></a> -<span class="sourceLineNo">165</span> try {<a name="line.165"></a> -<span class="sourceLineNo">166</span> if (cmd.hasOption(PORT_OPTION)) {<a name="line.166"></a> -<span class="sourceLineNo">167</span> int listenPort = Integer.parseInt(cmd.getOptionValue(PORT_OPTION));<a name="line.167"></a> -<span class="sourceLineNo">168</span> conf.setInt(ThriftServerRunner.PORT_CONF_KEY, listenPort);<a name="line.168"></a> +<span class="sourceLineNo">145</span> CommandLineParser parser = new DefaultParser();<a name="line.145"></a> +<span class="sourceLineNo">146</span> CommandLine cmd = parser.parse(options, args);<a name="line.146"></a> +<span class="sourceLineNo">147</span><a name="line.147"></a> +<span class="sourceLineNo">148</span> if (cmd.hasOption("help")) {<a name="line.148"></a> +<span class="sourceLineNo">149</span> printUsageAndExit(options, 1);<a name="line.149"></a> +<span class="sourceLineNo">150</span> }<a name="line.150"></a> +<span class="sourceLineNo">151</span><a name="line.151"></a> +<span class="sourceLineNo">152</span> // Get port to bind to<a name="line.152"></a> +<span class="sourceLineNo">153</span> try {<a name="line.153"></a> +<span class="sourceLineNo">154</span> if (cmd.hasOption(PORT_OPTION)) {<a name="line.154"></a> +<span class="sourceLineNo">155</span> int listenPort = Integer.parseInt(cmd.getOptionValue(PORT_OPTION));<a name="line.155"></a> +<span class="sourceLineNo">156</span> conf.setInt(ThriftServerRunner.PORT_CONF_KEY, listenPort);<a name="line.156"></a> +<span class="sourceLineNo">157</span> }<a name="line.157"></a> +<span class="sourceLineNo">158</span> } catch (NumberFormatException e) {<a name="line.158"></a> +<span class="sourceLineNo">159</span> LOG.error("Could not parse the value provided for the port option", e);<a name="line.159"></a> +<span class="sourceLineNo">160</span> printUsageAndExit(options, -1);<a name="line.160"></a> +<span class="sourceLineNo">161</span> }<a name="line.161"></a> +<span class="sourceLineNo">162</span><a name="line.162"></a> +<span class="sourceLineNo">163</span> // check for user-defined info server port setting, if so override the conf<a name="line.163"></a> +<span class="sourceLineNo">164</span> try {<a name="line.164"></a> +<span class="sourceLineNo">165</span> if (cmd.hasOption("infoport")) {<a name="line.165"></a> +<span class="sourceLineNo">166</span> String val = cmd.getOptionValue("infoport");<a name="line.166"></a> +<span class="sourceLineNo">167</span> conf.setInt("hbase.thrift.info.port", Integer.parseInt(val));<a name="line.167"></a> +<span class="sourceLineNo">168</span> LOG.debug("Web UI port set to " + val);<a name="line.168"></a> <span class="sourceLineNo">169</span> }<a name="line.169"></a> <span class="sourceLineNo">170</span> } catch (NumberFormatException e) {<a name="line.170"></a> -<span class="sourceLineNo">171</span> LOG.error("Could not parse the value provided for the port option", e);<a name="line.171"></a> +<span class="sourceLineNo">171</span> LOG.error("Could not parse the value provided for the infoport option", e);<a name="line.171"></a> <span class="sourceLineNo">172</span> printUsageAndExit(options, -1);<a name="line.172"></a> <span class="sourceLineNo">173</span> }<a name="line.173"></a> <span class="sourceLineNo">174</span><a name="line.174"></a> -<span class="sourceLineNo">175</span> // check for user-defined info server port setting, if so override the conf<a name="line.175"></a> -<span class="sourceLineNo">176</span> try {<a name="line.176"></a> -<span class="sourceLineNo">177</span> if (cmd.hasOption("infoport")) {<a name="line.177"></a> -<span class="sourceLineNo">178</span> String val = cmd.getOptionValue("infoport");<a name="line.178"></a> -<span class="sourceLineNo">179</span> conf.setInt("hbase.thrift.info.port", Integer.parseInt(val));<a name="line.179"></a> -<span class="sourceLineNo">180</span> LOG.debug("Web UI port set to " + val);<a name="line.180"></a> -<span class="sourceLineNo">181</span> }<a name="line.181"></a> -<span class="sourceLineNo">182</span> } catch (NumberFormatException e) {<a name="line.182"></a> -<span class="sourceLineNo">183</span> LOG.error("Could not parse the value provided for the infoport option", e);<a name="line.183"></a> -<span class="sourceLineNo">184</span> printUsageAndExit(options, -1);<a name="line.184"></a> -<span class="sourceLineNo">185</span> }<a name="line.185"></a> +<span class="sourceLineNo">175</span> // Make optional changes to the configuration based on command-line options<a name="line.175"></a> +<span class="sourceLineNo">176</span> optionToConf(cmd, MIN_WORKERS_OPTION,<a name="line.176"></a> +<span class="sourceLineNo">177</span> conf, TBoundedThreadPoolServer.MIN_WORKER_THREADS_CONF_KEY);<a name="line.177"></a> +<span class="sourceLineNo">178</span> optionToConf(cmd, MAX_WORKERS_OPTION,<a name="line.178"></a> +<span class="sourceLineNo">179</span> conf, TBoundedThreadPoolServer.MAX_WORKER_THREADS_CONF_KEY);<a name="line.179"></a> +<span class="sourceLineNo">180</span> optionToConf(cmd, MAX_QUEUE_SIZE_OPTION,<a name="line.180"></a> +<span class="sourceLineNo">181</span> conf, TBoundedThreadPoolServer.MAX_QUEUED_REQUESTS_CONF_KEY);<a name="line.181"></a> +<span class="sourceLineNo">182</span> optionToConf(cmd, KEEP_ALIVE_SEC_OPTION,<a name="line.182"></a> +<span class="sourceLineNo">183</span> conf, TBoundedThreadPoolServer.THREAD_KEEP_ALIVE_TIME_SEC_CONF_KEY);<a name="line.183"></a> +<span class="sourceLineNo">184</span> optionToConf(cmd, READ_TIMEOUT_OPTION, conf,<a name="line.184"></a> +<span class="sourceLineNo">185</span> ThriftServerRunner.THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY);<a name="line.185"></a> <span class="sourceLineNo">186</span><a name="line.186"></a> -<span class="sourceLineNo">187</span> // Make optional changes to the configuration based on command-line options<a name="line.187"></a> -<span class="sourceLineNo">188</span> optionToConf(cmd, MIN_WORKERS_OPTION,<a name="line.188"></a> -<span class="sourceLineNo">189</span> conf, TBoundedThreadPoolServer.MIN_WORKER_THREADS_CONF_KEY);<a name="line.189"></a> -<span class="sourceLineNo">190</span> optionToConf(cmd, MAX_WORKERS_OPTION,<a name="line.190"></a> -<span class="sourceLineNo">191</span> conf, TBoundedThreadPoolServer.MAX_WORKER_THREADS_CONF_KEY);<a name="line.191"></a> -<span class="sourceLineNo">192</span> optionToConf(cmd, MAX_QUEUE_SIZE_OPTION,<a name="line.192"></a> -<span class="sourceLineNo">193</span> conf, TBoundedThreadPoolServer.MAX_QUEUED_REQUESTS_CONF_KEY);<a name="line.193"></a> -<span class="sourceLineNo">194</span> optionToConf(cmd, KEEP_ALIVE_SEC_OPTION,<a name="line.194"></a> -<span class="sourceLineNo">195</span> conf, TBoundedThreadPoolServer.THREAD_KEEP_ALIVE_TIME_SEC_CONF_KEY);<a name="line.195"></a> -<span class="sourceLineNo">196</span> optionToConf(cmd, READ_TIMEOUT_OPTION, conf,<a name="line.196"></a> -<span class="sourceLineNo">197</span> ThriftServerRunner.THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY);<a name="line.197"></a> -<span class="sourceLineNo">198</span> <a name="line.198"></a> -<span class="sourceLineNo">199</span> // Set general thrift server options<a name="line.199"></a> -<span class="sourceLineNo">200</span> boolean compact = cmd.hasOption(COMPACT_OPTION) ||<a name="line.200"></a> -<span class="sourceLineNo">201</span> conf.getBoolean(ThriftServerRunner.COMPACT_CONF_KEY, false);<a name="line.201"></a> -<span class="sourceLineNo">202</span> conf.setBoolean(ThriftServerRunner.COMPACT_CONF_KEY, compact);<a name="line.202"></a> -<span class="sourceLineNo">203</span> boolean framed = cmd.hasOption(FRAMED_OPTION) ||<a name="line.203"></a> -<span class="sourceLineNo">204</span> conf.getBoolean(ThriftServerRunner.FRAMED_CONF_KEY, false);<a name="line.204"></a> -<span class="sourceLineNo">205</span> conf.setBoolean(ThriftServerRunner.FRAMED_CONF_KEY, framed);<a name="line.205"></a> -<span class="sourceLineNo">206</span> if (cmd.hasOption(BIND_OPTION)) {<a name="line.206"></a> -<span class="sourceLineNo">207</span> conf.set(ThriftServerRunner.BIND_CONF_KEY, cmd.getOptionValue(BIND_OPTION));<a name="line.207"></a> -<span class="sourceLineNo">208</span> }<a name="line.208"></a> -<span class="sourceLineNo">209</span><a name="line.209"></a> -<span class="sourceLineNo">210</span> ImplType.setServerImpl(cmd, conf);<a name="line.210"></a> +<span class="sourceLineNo">187</span> // Set general thrift server options<a name="line.187"></a> +<span class="sourceLineNo">188</span> boolean compact = cmd.hasOption(COMPACT_OPTION) ||<a name="line.188"></a> +<span class="sourceLineNo">189</span> conf.getBoolean(ThriftServerRunner.COMPACT_CONF_KEY, false);<a name="line.189"></a> +<span class="sourceLineNo">190</span> conf.setBoolean(ThriftServerRunner.COMPACT_CONF_KEY, compact);<a name="line.190"></a> +<span class="sourceLineNo">191</span> boolean framed = cmd.hasOption(FRAMED_OPTION) ||<a name="line.191"></a> +<span class="sourceLineNo">192</span> conf.getBoolean(ThriftServerRunner.FRAMED_CONF_KEY, false);<a name="line.192"></a> +<span class="sourceLineNo">193</span> conf.setBoolean(ThriftServerRunner.FRAMED_CONF_KEY, framed);<a name="line.193"></a> +<span class="sourceLineNo">194</span> if (cmd.hasOption(BIND_OPTION)) {<a name="line.194"></a> +<span class="sourceLineNo">195</span> conf.set(ThriftServerRunner.BIND_CONF_KEY, cmd.getOptionValue(BIND_OPTION));<a name="line.195"></a> +<span class="sourceLineNo">196</span> }<a name="line.196"></a> +<span class="sourceLineNo">197</span><a name="line.197"></a> +<span class="sourceLineNo">198</span> ImplType.setServerImpl(cmd, conf);<a name="line.198"></a> +<span class="sourceLineNo">199</span> }<a name="line.199"></a> +<span class="sourceLineNo">200</span><a name="line.200"></a> +<span class="sourceLineNo">201</span> public void stop() {<a name="line.201"></a> +<span class="sourceLineNo">202</span> if (this.infoServer != null) {<a name="line.202"></a> +<span class="sourceLineNo">203</span> LOG.info("Stopping infoServer");<a name="line.203"></a> +<span class="sourceLineNo">204</span> try {<a name="line.204"></a> +<span class="sourceLineNo">205</span> this.infoServer.stop();<a name="line.205"></a> +<span class="sourceLineNo">206</span> } catch (Exception ex) {<a name="line.206"></a> +<span class="sourceLineNo">207</span> ex.printStackTrace();<a name="line.207"></a> +<span class="sourceLineNo">208</span> }<a name="line.208"></a> +<span class="sourceLineNo">209</span> }<a name="line.209"></a> +<span class="sourceLineNo">210</span> serverRunner.shutdown();<a name="line.210"></a> <span class="sourceLineNo">211</span> }<a name="line.211"></a> <span class="sourceLineNo">212</span><a name="line.212"></a> -<span class="sourceLineNo">213</span> public void stop() {<a name="line.213"></a> -<span class="sourceLineNo">214</span> if (this.infoServer != null) {<a name="line.214"></a> -<span class="sourceLineNo">215</span> LOG.info("Stopping infoServer");<a name="line.215"></a> -<span class="sourceLineNo">216</span> try {<a name="line.216"></a> -<span class="sourceLineNo">217</span> this.infoServer.stop();<a name="line.217"></a> -<span class="sourceLineNo">218</span> } catch (Exception ex) {<a name="line.218"></a> -<span class="sourceLineNo">219</span> ex.printStackTrace();<a name="line.219"></a> -<span class="sourceLineNo">220</span> }<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span> serverRunner.shutdown();<a name="line.222"></a> -<span class="sourceLineNo">223</span> }<a name="line.223"></a> -<span class="sourceLineNo">224</span><a name="line.224"></a> -<span class="sourceLineNo">225</span> private static void optionToConf(CommandLine cmd, String option,<a name="line.225"></a> -<span class="sourceLineNo">226</span> Configuration conf, String destConfKey) {<a name="line.226"></a> -<span class="sourceLineNo">227</span> if (cmd.hasOption(option)) {<a name="line.227"></a> -<span class="sourceLineNo">228</span> String value = cmd.getOptionValue(option);<a name="line.228"></a> -<span class="sourceLineNo">229</span> LOG.info("Set configuration key:" + destConfKey + " value:" + value);<a name="line.229"></a> -<span class="sourceLineNo">230</span> conf.set(destConfKey, value);<a name="line.230"></a> -<span class="sourceLineNo">231</span> }<a name="line.231"></a> -<span class="sourceLineNo">232</span> }<a name="line.232"></a> -<span class="sourceLineNo">233</span><a name="line.233"></a> -<span class="sourceLineNo">234</span> public static void main(String [] args) throws Exception {<a name="line.234"></a> -<span class="sourceLineNo">235</span> LOG.info("***** STARTING service '" + ThriftServer.class.getSimpleName() + "' *****");<a name="line.235"></a> -<span class="sourceLineNo">236</span> VersionInfo.logVersion();<a name="line.236"></a> -<span class="sourceLineNo">237</span> int exitCode = 0;<a name="line.237"></a> -<span class="sourceLineNo">238</span> try {<a name="line.238"></a> -<span class="sourceLineNo">239</span> new ThriftServer(HBaseConfiguration.create()).doMain(args);<a name="line.239"></a> -<span class="sourceLineNo">240</span> } catch (ExitCodeException ex) {<a name="line.240"></a> -<span class="sourceLineNo">241</span> exitCode = ex.getExitCode();<a name="line.241"></a> -<span class="sourceLineNo">242</span> }<a name="line.242"></a> -<span class="sourceLineNo">243</span> LOG.info("***** STOPPING service '" + ThriftServer.class.getSimpleName() + "' *****");<a name="line.243"></a> -<span class="sourceLineNo">244</span> System.exit(exitCode);<a name="line.244"></a> -<span class="sourceLineNo">245</span> }<a name="line.245"></a> -<span class="sourceLineNo">246</span>}<a name="line.246"></a> +<span class="sourceLineNo">213</span> private static void optionToConf(CommandLine cmd, String option,<a name="line.213"></a> +<span class="sourceLineNo">214</span> Configuration conf, String destConfKey) {<a name="line.214"></a> +<span class="sourceLineNo">215</span> if (cmd.hasOption(option)) {<a name="line.215"></a> +<span class="sourceLineNo">216</span> String value = cmd.getOptionValue(option);<a name="line.216"></a> +<span class="sourceLineNo">217</span> LOG.info("Set configuration key:" + destConfKey + " value:" + value);<a name="line.217"></a> +<span class="sourceLineNo">218</span> conf.set(destConfKey, value);<a name="line.218"></a> +<span class="sourceLineNo">219</span> }<a name="line.219"></a> +<span class="sourceLineNo">220</span> }<a name="line.220"></a> +<span class="sourceLineNo">221</span><a name="line.221"></a> +<span class="sourceLineNo">222</span> public static void main(String [] args) throws Exception {<a name="line.222"></a> +<span class="sourceLineNo">223</span> LOG.info("***** STARTING service '" + ThriftServer.class.getSimpleName() + "' *****");<a name="line.223"></a> +<span class="sourceLineNo">224</span> VersionInfo.logVersion();<a name="line.224"></a> +<span class="sourceLineNo">225</span> int exitCode = 0;<a name="line.225"></a> +<span class="sourceLineNo">226</span> try {<a name="line.226"></a> +<span class="sourceLineNo">227</span> new ThriftServer(HBaseConfiguration.create()).doMain(args);<a name="line.227"></a> +<span class="sourceLineNo">228</span> } catch (ExitCodeException ex) {<a name="line.228"></a> +<span class="sourceLineNo">229</span> exitCode = ex.getExitCode();<a name="line.229"></a> +<span class="sourceLineNo">230</span> }<a name="line.230"></a> +<span class="sourceLineNo">231</span> LOG.info("***** STOPPING service '" + ThriftServer.class.getSimpleName() + "' *****");<a name="line.231"></a> +<span class="sourceLineNo">232</span> System.exit(exitCode);<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span>}<a name="line.234"></a>
