http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d220bc5e/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html
index 1c73421..783dc34 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftServer.html
@@ -31,115 +31,115 @@
 <span class="sourceLineNo">023</span>import java.net.InetSocketAddress;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.net.UnknownHostException;<a 
name="line.24"></a>
 <span class="sourceLineNo">025</span>import java.security.PrivilegedAction;<a 
name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.List;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.Map;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
java.util.concurrent.ExecutorService;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
java.util.concurrent.LinkedBlockingQueue;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
java.util.concurrent.SynchronousQueue;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
java.util.concurrent.ThreadPoolExecutor;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.concurrent.TimeUnit;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
javax.security.auth.callback.Callback;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
javax.security.auth.callback.UnsupportedCallbackException;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
javax.security.sasl.AuthorizeCallback;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import javax.security.sasl.SaslServer;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.conf.Configured;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.filter.ParseFilter;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.http.InfoServer;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.security.SaslUtil;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.security.SecurityUtil;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.security.UserProvider;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.thrift.CallQueue;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.thrift.THBaseThreadPoolExecutor;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.thrift.ThriftMetrics;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.thrift2.generated.THBaseService;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.util.DNS;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.util.JvmPauseMonitor;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.util.Strings;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.security.SaslRpcServer.SaslGssCallbackHandler;<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.security.UserGroupInformation;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.util.Tool;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.thrift.TException;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.thrift.TProcessor;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>import 
org.apache.thrift.protocol.TBinaryProtocol;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import 
org.apache.thrift.protocol.TCompactProtocol;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import 
org.apache.thrift.protocol.TProtocol;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import 
org.apache.thrift.protocol.TProtocolFactory;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import 
org.apache.thrift.server.THsHaServer;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import 
org.apache.thrift.server.TNonblockingServer;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import 
org.apache.thrift.server.TServer;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import 
org.apache.thrift.server.TThreadPoolServer;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import 
org.apache.thrift.server.TThreadedSelectorServer;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import 
org.apache.thrift.transport.TFramedTransport;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import 
org.apache.thrift.transport.TNonblockingServerSocket;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import 
org.apache.thrift.transport.TNonblockingServerTransport;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import 
org.apache.thrift.transport.TSaslServerTransport;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import 
org.apache.thrift.transport.TServerSocket;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import 
org.apache.thrift.transport.TServerTransport;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import 
org.apache.thrift.transport.TTransportException;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import 
org.apache.thrift.transport.TTransportFactory;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import org.slf4j.Logger;<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>import org.slf4j.LoggerFactory;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a
 name="line.81"></a>
-<span class="sourceLineNo">082</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLineParser;<a 
name="line.83"></a>
+<span class="sourceLineNo">026</span>import java.util.Map;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
java.util.concurrent.ExecutorService;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
java.util.concurrent.LinkedBlockingQueue;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
java.util.concurrent.SynchronousQueue;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
java.util.concurrent.ThreadPoolExecutor;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.concurrent.TimeUnit;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
javax.security.auth.callback.Callback;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
javax.security.auth.callback.UnsupportedCallbackException;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
javax.security.sasl.AuthorizeCallback;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import javax.security.sasl.SaslServer;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.conf.Configured;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.HBaseInterfaceAudience;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.filter.ParseFilter;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.http.InfoServer;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.security.SaslUtil;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.security.SecurityUtil;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.security.UserProvider;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.thrift.CallQueue;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.thrift.THBaseThreadPoolExecutor;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.thrift.ThriftMetrics;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.thrift2.generated.THBaseService;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.util.DNS;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.util.JvmPauseMonitor;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.util.Strings;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.security.SaslRpcServer.SaslGssCallbackHandler;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.security.UserGroupInformation;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.util.Tool;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.util.ToolRunner;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.thrift.TException;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.thrift.TProcessor;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>import 
org.apache.thrift.protocol.TBinaryProtocol;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import 
org.apache.thrift.protocol.TCompactProtocol;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import 
org.apache.thrift.protocol.TProtocol;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import 
org.apache.thrift.protocol.TProtocolFactory;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import 
org.apache.thrift.server.THsHaServer;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import 
org.apache.thrift.server.TNonblockingServer;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import 
org.apache.thrift.server.TServer;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import 
org.apache.thrift.server.TThreadPoolServer;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import 
org.apache.thrift.server.TThreadedSelectorServer;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import 
org.apache.thrift.transport.TFramedTransport;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import 
org.apache.thrift.transport.TNonblockingServerSocket;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import 
org.apache.thrift.transport.TNonblockingServerTransport;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import 
org.apache.thrift.transport.TSaslServerTransport;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import 
org.apache.thrift.transport.TServerSocket;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import 
org.apache.thrift.transport.TServerTransport;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import 
org.apache.thrift.transport.TTransportException;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import 
org.apache.thrift.transport.TTransportFactory;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.slf4j.Logger;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.slf4j.LoggerFactory;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>import 
org.apache.hbase.thirdparty.com.google.common.util.concurrent.ThreadFactoryBuilder;<a
 name="line.80"></a>
+<span class="sourceLineNo">081</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLineParser;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.DefaultParser;<a 
name="line.83"></a>
 <span class="sourceLineNo">084</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.HelpFormatter;<a 
name="line.84"></a>
 <span class="sourceLineNo">085</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.Option;<a name="line.85"></a>
 <span class="sourceLineNo">086</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.OptionGroup;<a 
name="line.86"></a>
 <span class="sourceLineNo">087</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.Options;<a 
name="line.87"></a>
 <span class="sourceLineNo">088</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.ParseException;<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>import 
org.apache.hbase.thirdparty.org.apache.commons.cli.PosixParser;<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>/**<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * ThriftServer - this class starts up a 
Thrift server which implements the HBase API specified in<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * the HbaseClient.thrift IDL file.<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span 
class="sourceLineNo">095</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a
 name="line.95"></a>
-<span class="sourceLineNo">096</span>@SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.96"></a>
-<span class="sourceLineNo">097</span>public class ThriftServer extends 
Configured implements Tool {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  private static final Logger log = 
LoggerFactory.getLogger(ThriftServer.class);<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  /**<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * Thrift quality of protection 
configuration key. Valid values can be:<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * privacy: authentication, integrity 
and confidentiality checking<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * integrity: authentication and 
integrity checking<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   * authentication: authentication 
only<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   *<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * This is used to authenticate the 
callers and support impersonation.<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   * The thrift server and the HBase 
cluster must run in secure mode.<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  static final String THRIFT_QOP_KEY = 
"hbase.thrift.security.qop";<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  static final String BACKLOG_CONF_KEY = 
"hbase.regionserver.thrift.backlog";<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public static final int 
DEFAULT_LISTEN_PORT = 9090;<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  private static final String 
READ_TIMEOUT_OPTION = "readTimeout";<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>  /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   * Amount of time in milliseconds 
before a server thread will timeout<a name="line.118"></a>
-<span class="sourceLineNo">119</span>   * waiting for client to send data on a 
connected socket. Currently,<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   * applies only to 
TBoundedThreadPoolServer<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   */<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  public static final String 
THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY =<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    
"hbase.thrift.server.socket.read.timeout";<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  public static final int 
THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT = 60000;<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  public ThriftServer() {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>  private static void printUsage() {<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>    HelpFormatter formatter = new 
HelpFormatter();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    formatter.printHelp("Thrift", null, 
getOptions(),<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        "To start the Thrift server run 
'hbase-daemon.sh start thrift2'\n" +<a name="line.132"></a>
-<span class="sourceLineNo">133</span>            "To shutdown the thrift 
server run 'hbase-daemon.sh stop thrift2' or" +<a name="line.133"></a>
-<span class="sourceLineNo">134</span>            " send a kill signal to the 
thrift server pid",<a name="line.134"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>/**<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * ThriftServer - this class starts up a 
Thrift server which implements the HBase API specified in<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * the HbaseClient.thrift IDL file.<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span 
class="sourceLineNo">094</span>@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)<a
 name="line.94"></a>
+<span class="sourceLineNo">095</span>@SuppressWarnings({ "rawtypes", 
"unchecked" })<a name="line.95"></a>
+<span class="sourceLineNo">096</span>public class ThriftServer extends 
Configured implements Tool {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  private static final Logger log = 
LoggerFactory.getLogger(ThriftServer.class);<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  /**<a name="line.99"></a>
+<span class="sourceLineNo">100</span>   * Thrift quality of protection 
configuration key. Valid values can be:<a name="line.100"></a>
+<span class="sourceLineNo">101</span>   * privacy: authentication, integrity 
and confidentiality checking<a name="line.101"></a>
+<span class="sourceLineNo">102</span>   * integrity: authentication and 
integrity checking<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * authentication: authentication 
only<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   *<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * This is used to authenticate the 
callers and support impersonation.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * The thrift server and the HBase 
cluster must run in secure mode.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   */<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  static final String THRIFT_QOP_KEY = 
"hbase.thrift.security.qop";<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>  static final String BACKLOG_CONF_KEY = 
"hbase.regionserver.thrift.backlog";<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  public static final int 
DEFAULT_LISTEN_PORT = 9090;<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>  private static final String 
READ_TIMEOUT_OPTION = "readTimeout";<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>  /**<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * Amount of time in milliseconds 
before a server thread will timeout<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * waiting for client to send data on a 
connected socket. Currently,<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   * applies only to 
TBoundedThreadPoolServer<a name="line.119"></a>
+<span class="sourceLineNo">120</span>   */<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  public static final String 
THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY =<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    
"hbase.thrift.server.socket.read.timeout";<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  public static final int 
THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT = 60000;<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  public ThriftServer() {<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  private static void printUsage() {<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    HelpFormatter formatter = new 
HelpFormatter();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    formatter.printHelp("Thrift", null, 
getOptions(),<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        "To start the Thrift server run 
'hbase-daemon.sh start thrift2' or " +<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        "'hbase thrift2'\n" +<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        "To shutdown the thrift server 
run 'hbase-daemon.sh stop thrift2' or" +<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        " send a kill signal to the 
thrift server pid",<a name="line.134"></a>
 <span class="sourceLineNo">135</span>        true);<a name="line.135"></a>
 <span class="sourceLineNo">136</span>  }<a name="line.136"></a>
 <span class="sourceLineNo">137</span><a name="line.137"></a>
@@ -177,7 +177,7 @@
 <span class="sourceLineNo">169</span><a name="line.169"></a>
 <span class="sourceLineNo">170</span>  private static CommandLine 
parseArguments(Configuration conf, Options options, String[] args)<a 
name="line.170"></a>
 <span class="sourceLineNo">171</span>      throws ParseException, IOException 
{<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    CommandLineParser parser = new 
PosixParser();<a name="line.172"></a>
+<span class="sourceLineNo">172</span>    CommandLineParser parser = new 
DefaultParser();<a name="line.172"></a>
 <span class="sourceLineNo">173</span>    return parser.parse(options, args);<a 
name="line.173"></a>
 <span class="sourceLineNo">174</span>  }<a name="line.174"></a>
 <span class="sourceLineNo">175</span><a name="line.175"></a>
@@ -396,251 +396,239 @@
 <span class="sourceLineNo">388</span>    int selectorThreads = 0;<a 
name="line.388"></a>
 <span class="sourceLineNo">389</span>    int maxCallQueueSize = -1; // use 
unbounded queue by default<a name="line.389"></a>
 <span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>    if (checkArguments(cmd)) {<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>      return 1;<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    }<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span>    // Get address to bind<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>    String bindAddress = 
getBindAddress(conf, cmd);<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>    // check if server should only 
process read requests, if so override the conf<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    if (cmd.hasOption("readonly")) {<a 
name="line.399"></a>
-<span class="sourceLineNo">400</span>      
conf.setBoolean("hbase.thrift.readonly", true);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      if (log.isDebugEnabled()) {<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>        log.debug("readonly set to 
true");<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      }<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    }<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>    // Get read timeout<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>    int readTimeout = 
getReadTimeout(conf, cmd);<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    // Get port to bind to<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>    int listenPort = getListenPort(conf, 
cmd);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    // Thrift's implementation uses '0' 
as a placeholder for 'use the default.'<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    int backlog = 
conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>    // Local hostname and user name, used 
only if QOP is configured.<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    String host = null;<a 
name="line.414"></a>
-<span class="sourceLineNo">415</span>    String name = null;<a 
name="line.415"></a>
-<span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>    UserProvider userProvider = 
UserProvider.instantiate(conf);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    // login the server principal (if 
using secure Hadoop)<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    boolean securityEnabled = 
userProvider.isHadoopSecurityEnabled()<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      &amp;&amp; 
userProvider.isHBaseSecurityEnabled();<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    if (securityEnabled) {<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>      host = 
Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.422"></a>
-<span class="sourceLineNo">423</span>        
conf.get("hbase.thrift.dns.interface", "default"),<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        
conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      
userProvider.login("hbase.thrift.keytab.file", 
"hbase.thrift.kerberos.principal", host);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>    UserGroupInformation realUser = 
userProvider.getCurrent().getUGI();<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    String stringQop = 
conf.get(THRIFT_QOP_KEY);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    SaslUtil.QualityOfProtection qop = 
null;<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    if (stringQop != null) {<a 
name="line.431"></a>
-<span class="sourceLineNo">432</span>      qop = SaslUtil.getQop(stringQop);<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>      if (!securityEnabled) {<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span>        throw new IOException("Thrift 
server must run in secure mode to support authentication");<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>      }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      // Extract the name from the 
principal<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      name = 
SecurityUtil.getUserFromPrincipal(conf.get("hbase.thrift.kerberos.principal"));<a
 name="line.437"></a>
-<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>    boolean nonblocking = 
cmd.hasOption("nonblocking");<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    boolean hsha = 
cmd.hasOption("hsha");<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    boolean selector = 
cmd.hasOption("selector");<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>    ThriftMetrics metrics = new 
ThriftMetrics(conf, ThriftMetrics.ThriftServerType.TWO);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    final JvmPauseMonitor pauseMonitor = 
new JvmPauseMonitor(conf, metrics.getSource());<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>    String implType = 
getImplType(nonblocking, hsha, selector);<a name="line.447"></a>
-<span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>    
conf.set("hbase.regionserver.thrift.server.type", implType);<a 
name="line.449"></a>
-<span class="sourceLineNo">450</span>    
conf.setInt("hbase.regionserver.thrift.port", listenPort);<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>    registerFilters(conf);<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span>    // Construct correct 
ProtocolFactory<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    boolean compact = 
cmd.hasOption("compact") ||<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        
conf.getBoolean("hbase.regionserver.thrift.compact", false);<a 
name="line.455"></a>
-<span class="sourceLineNo">456</span>    TProtocolFactory protocolFactory = 
getTProtocolFactory(compact);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    final ThriftHBaseServiceHandler 
hbaseHandler =<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      new ThriftHBaseServiceHandler(conf, 
userProvider);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    THBaseService.Iface handler =<a 
name="line.459"></a>
-<span class="sourceLineNo">460</span>      
ThriftHBaseServiceHandler.newInstance(hbaseHandler, metrics);<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>    final THBaseService.Processor p = new 
THBaseService.Processor(handler);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    
conf.setBoolean("hbase.regionserver.thrift.compact", compact);<a 
name="line.462"></a>
-<span class="sourceLineNo">463</span>    TProcessor processor = p;<a 
name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>    boolean framed = 
cmd.hasOption("framed") ||<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        
conf.getBoolean("hbase.regionserver.thrift.framed", false) || nonblocking || 
hsha;<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    TTransportFactory transportFactory = 
getTTransportFactory(qop, name, host, framed,<a name="line.467"></a>
-<span class="sourceLineNo">468</span>        
conf.getInt("hbase.regionserver.thrift.framed.max_frame_size_in_mb", 2) * 1024 
* 1024);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    InetSocketAddress inetSocketAddress = 
bindToPort(bindAddress, listenPort);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    
conf.setBoolean("hbase.regionserver.thrift.framed", framed);<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>    if (qop != null) {<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span>      // Create a processor wrapper, to 
get the caller<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      processor = new TProcessor() {<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>        @Override<a name="line.474"></a>
-<span class="sourceLineNo">475</span>        public boolean process(TProtocol 
inProt,<a name="line.475"></a>
-<span class="sourceLineNo">476</span>            TProtocol outProt) throws 
TException {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>          TSaslServerTransport 
saslServerTransport =<a name="line.477"></a>
-<span class="sourceLineNo">478</span>            
(TSaslServerTransport)inProt.getTransport();<a name="line.478"></a>
-<span class="sourceLineNo">479</span>          SaslServer saslServer = 
saslServerTransport.getSaslServer();<a name="line.479"></a>
-<span class="sourceLineNo">480</span>          String principal = 
saslServer.getAuthorizationID();<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          
hbaseHandler.setEffectiveUser(principal);<a name="line.481"></a>
-<span class="sourceLineNo">482</span>          return p.process(inProt, 
outProt);<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        }<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      };<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>    if (cmd.hasOption("w")) {<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>      workerThreads = 
Integer.parseInt(cmd.getOptionValue("w"));<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    if (cmd.hasOption("s")) {<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>      selectorThreads = 
Integer.parseInt(cmd.getOptionValue("s"));<a name="line.491"></a>
-<span class="sourceLineNo">492</span>    }<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    if (cmd.hasOption("q")) {<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>      maxCallQueueSize = 
Integer.parseInt(cmd.getOptionValue("q"));<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    }<a name="line.495"></a>
-<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span>    // check for user-defined info server 
port setting, if so override the conf<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    try {<a name="line.498"></a>
-<span class="sourceLineNo">499</span>      if (cmd.hasOption("infoport")) {<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>        String val = 
cmd.getOptionValue("infoport");<a name="line.500"></a>
-<span class="sourceLineNo">501</span>        
conf.setInt("hbase.thrift.info.port", Integer.parseInt(val));<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>        log.debug("Web UI port set to " + 
val);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    } catch (NumberFormatException e) {<a 
name="line.504"></a>
-<span class="sourceLineNo">505</span>      log.error("Could not parse the 
value provided for the infoport option", e);<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      printUsage();<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      System.exit(1);<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>    }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>    // Put up info server.<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>    startInfoServer(conf);<a 
name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span>    final TServer tserver = 
getServer(workerThreads, selectorThreads, maxCallQueueSize, readTimeout,<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>            backlog, nonblocking, hsha, 
selector, metrics, protocolFactory, processor,<a name="line.514"></a>
-<span class="sourceLineNo">515</span>            transportFactory, 
inetSocketAddress);<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span>    realUser.doAs(<a name="line.517"></a>
-<span class="sourceLineNo">518</span>      new 
PrivilegedAction&lt;Object&gt;() {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>        @Override<a name="line.519"></a>
-<span class="sourceLineNo">520</span>        public Object run() {<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span>          pauseMonitor.start();<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span>          try {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            tserver.serve();<a 
name="line.523"></a>
-<span class="sourceLineNo">524</span>            return null;<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>          } finally {<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span>            pauseMonitor.stop();<a 
name="line.526"></a>
-<span class="sourceLineNo">527</span>          }<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        }<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      });<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    // when tserver.stop eventually 
happens we'll get here.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    return 0;<a name="line.531"></a>
-<span class="sourceLineNo">532</span>  }<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span>  private String getImplType(boolean 
nonblocking, boolean hsha, boolean selector) {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>    String implType = "threadpool";<a 
name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span>    if (nonblocking) {<a 
name="line.537"></a>
-<span class="sourceLineNo">538</span>      implType = "nonblocking";<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>    } else if (hsha) {<a 
name="line.539"></a>
-<span class="sourceLineNo">540</span>      implType = "hsha";<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>    } else if (selector) {<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>      implType = "selector";<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>    }<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span>    return implType;<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>  }<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span>  private boolean 
checkArguments(CommandLine cmd) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    /*<a name="line.549"></a>
-<span class="sourceLineNo">550</span>     * This is to please both bin/hbase 
and bin/hbase-daemon. hbase-daemon provides "start" and<a name="line.550"></a>
-<span class="sourceLineNo">551</span>     * "stop" arguments hbase should 
print the help if no argument is provided<a name="line.551"></a>
-<span class="sourceLineNo">552</span>     */<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    List&lt;?&gt; argList = 
cmd.getArgList();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    if (cmd.hasOption("help") || 
!argList.contains("start") || argList.contains("stop")) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      printUsage();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>      return true;<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    }<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    return false;<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span>  private String 
getBindAddress(Configuration conf, CommandLine cmd) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    String bindAddress;<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span>    if (cmd.hasOption("bind")) {<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>      bindAddress = 
cmd.getOptionValue("bind");<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      
conf.set("hbase.thrift.info.bindAddress", bindAddress);<a name="line.565"></a>
-<span class="sourceLineNo">566</span>    } else {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      bindAddress = 
conf.get("hbase.thrift.info.bindAddress");<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    }<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    return bindAddress;<a 
name="line.569"></a>
-<span class="sourceLineNo">570</span>  }<a name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span>  private int getListenPort(Configuration 
conf, CommandLine cmd) {<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    int listenPort;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>    try {<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      if (cmd.hasOption("port")) {<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>        listenPort = 
Integer.parseInt(cmd.getOptionValue("port"));<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      } else {<a name="line.577"></a>
-<span class="sourceLineNo">578</span>        listenPort = 
conf.getInt("hbase.regionserver.thrift.port", DEFAULT_LISTEN_PORT);<a 
name="line.578"></a>
-<span class="sourceLineNo">579</span>      }<a name="line.579"></a>
-<span class="sourceLineNo">580</span>    } catch (NumberFormatException e) {<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>      throw new RuntimeException("Could 
not parse the value provided for the port option", e);<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    return listenPort;<a 
name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  private int 
getReadTimeout(Configuration conf, CommandLine cmd) {<a name="line.586"></a>
-<span class="sourceLineNo">587</span>    int readTimeout;<a 
name="line.587"></a>
-<span class="sourceLineNo">588</span>    if 
(cmd.hasOption(READ_TIMEOUT_OPTION)) {<a name="line.588"></a>
-<span class="sourceLineNo">589</span>      try {<a name="line.589"></a>
-<span class="sourceLineNo">590</span>        readTimeout = 
Integer.parseInt(cmd.getOptionValue(READ_TIMEOUT_OPTION));<a 
name="line.590"></a>
-<span class="sourceLineNo">591</span>      } catch (NumberFormatException e) 
{<a name="line.591"></a>
-<span class="sourceLineNo">592</span>        throw new RuntimeException("Could 
not parse the value provided for the timeout option", e);<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      }<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    } else {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>      readTimeout = 
conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        
THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    return readTimeout;<a 
name="line.598"></a>
+<span class="sourceLineNo">391</span>    if (cmd.hasOption("help")) {<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      printUsage();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      return 1;<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    // Get address to bind<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>    String bindAddress = 
getBindAddress(conf, cmd);<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span>    // check if server should only 
process read requests, if so override the conf<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    if (cmd.hasOption("readonly")) {<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>      
conf.setBoolean("hbase.thrift.readonly", true);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      if (log.isDebugEnabled()) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>        log.debug("readonly set to 
true");<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    // Get read timeout<a 
name="line.407"></a>
+<span class="sourceLineNo">408</span>    int readTimeout = 
getReadTimeout(conf, cmd);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    // Get port to bind to<a 
name="line.409"></a>
+<span class="sourceLineNo">410</span>    int listenPort = getListenPort(conf, 
cmd);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    // Thrift's implementation uses '0' 
as a placeholder for 'use the default.'<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    int backlog = 
conf.getInt(BACKLOG_CONF_KEY, 0);<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span>    // Local hostname and user name, used 
only if QOP is configured.<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    String host = null;<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>    String name = null;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span>    UserProvider userProvider = 
UserProvider.instantiate(conf);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    // login the server principal (if 
using secure Hadoop)<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    boolean securityEnabled = 
userProvider.isHadoopSecurityEnabled()<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      &amp;&amp; 
userProvider.isHBaseSecurityEnabled();<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    if (securityEnabled) {<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>      host = 
Strings.domainNamePointerToHostName(DNS.getDefaultHost(<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        
conf.get("hbase.thrift.dns.interface", "default"),<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        
conf.get("hbase.thrift.dns.nameserver", "default")));<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      
userProvider.login("hbase.thrift.keytab.file", 
"hbase.thrift.kerberos.principal", host);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>    UserGroupInformation realUser = 
userProvider.getCurrent().getUGI();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    String stringQop = 
conf.get(THRIFT_QOP_KEY);<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    SaslUtil.QualityOfProtection qop = 
null;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    if (stringQop != null) {<a 
name="line.432"></a>
+<span class="sourceLineNo">433</span>      qop = SaslUtil.getQop(stringQop);<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>      if (!securityEnabled) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>        throw new IOException("Thrift 
server must run in secure mode to support authentication");<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>      }<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      // Extract the name from the 
principal<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      name = 
SecurityUtil.getUserFromPrincipal(conf.get("hbase.thrift.kerberos.principal"));<a
 name="line.438"></a>
+<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    boolean nonblocking = 
cmd.hasOption("nonblocking");<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    boolean hsha = 
cmd.hasOption("hsha");<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    boolean selector = 
cmd.hasOption("selector");<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>    ThriftMetrics metrics = new 
ThriftMetrics(conf, ThriftMetrics.ThriftServerType.TWO);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    final JvmPauseMonitor pauseMonitor = 
new JvmPauseMonitor(conf, metrics.getSource());<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>    String implType = 
getImplType(nonblocking, hsha, selector);<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>    
conf.set("hbase.regionserver.thrift.server.type", implType);<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>    
conf.setInt("hbase.regionserver.thrift.port", listenPort);<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>    registerFilters(conf);<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span><a name="line.453"></a>
+<span class="sourceLineNo">454</span>    // Construct correct 
ProtocolFactory<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    boolean compact = 
cmd.hasOption("compact") ||<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        
conf.getBoolean("hbase.regionserver.thrift.compact", false);<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>    TProtocolFactory protocolFactory = 
getTProtocolFactory(compact);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    final ThriftHBaseServiceHandler 
hbaseHandler =<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      new ThriftHBaseServiceHandler(conf, 
userProvider);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    THBaseService.Iface handler =<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>      
ThriftHBaseServiceHandler.newInstance(hbaseHandler, metrics);<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>    final THBaseService.Processor p = new 
THBaseService.Processor(handler);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    
conf.setBoolean("hbase.regionserver.thrift.compact", compact);<a 
name="line.463"></a>
+<span class="sourceLineNo">464</span>    TProcessor processor = p;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span><a name="line.465"></a>
+<span class="sourceLineNo">466</span>    boolean framed = 
cmd.hasOption("framed") ||<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        
conf.getBoolean("hbase.regionserver.thrift.framed", false) || nonblocking || 
hsha;<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    TTransportFactory transportFactory = 
getTTransportFactory(qop, name, host, framed,<a name="line.468"></a>
+<span class="sourceLineNo">469</span>        
conf.getInt("hbase.regionserver.thrift.framed.max_frame_size_in_mb", 2) * 1024 
* 1024);<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    InetSocketAddress inetSocketAddress = 
bindToPort(bindAddress, listenPort);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    
conf.setBoolean("hbase.regionserver.thrift.framed", framed);<a 
name="line.471"></a>
+<span class="sourceLineNo">472</span>    if (qop != null) {<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>      // Create a processor wrapper, to 
get the caller<a name="line.473"></a>
+<span class="sourceLineNo">474</span>      processor = new TProcessor() {<a 
name="line.474"></a>
+<span class="sourceLineNo">475</span>        @Override<a name="line.475"></a>
+<span class="sourceLineNo">476</span>        public boolean process(TProtocol 
inProt,<a name="line.476"></a>
+<span class="sourceLineNo">477</span>            TProtocol outProt) throws 
TException {<a name="line.477"></a>
+<span class="sourceLineNo">478</span>          TSaslServerTransport 
saslServerTransport =<a name="line.478"></a>
+<span class="sourceLineNo">479</span>            
(TSaslServerTransport)inProt.getTransport();<a name="line.479"></a>
+<span class="sourceLineNo">480</span>          SaslServer saslServer = 
saslServerTransport.getSaslServer();<a name="line.480"></a>
+<span class="sourceLineNo">481</span>          String principal = 
saslServer.getAuthorizationID();<a name="line.481"></a>
+<span class="sourceLineNo">482</span>          
hbaseHandler.setEffectiveUser(principal);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>          return p.process(inProt, 
outProt);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        }<a name="line.484"></a>
+<span class="sourceLineNo">485</span>      };<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    if (cmd.hasOption("w")) {<a 
name="line.488"></a>
+<span class="sourceLineNo">489</span>      workerThreads = 
Integer.parseInt(cmd.getOptionValue("w"));<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>    if (cmd.hasOption("s")) {<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>      selectorThreads = 
Integer.parseInt(cmd.getOptionValue("s"));<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    }<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    if (cmd.hasOption("q")) {<a 
name="line.494"></a>
+<span class="sourceLineNo">495</span>      maxCallQueueSize = 
Integer.parseInt(cmd.getOptionValue("q"));<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    }<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>    // check for user-defined info server 
port setting, if so override the conf<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    try {<a name="line.499"></a>
+<span class="sourceLineNo">500</span>      if (cmd.hasOption("infoport")) {<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>        String val = 
cmd.getOptionValue("infoport");<a name="line.501"></a>
+<span class="sourceLineNo">502</span>        
conf.setInt("hbase.thrift.info.port", Integer.parseInt(val));<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>        log.debug("Web UI port set to " + 
val);<a name="line.503"></a>
+<span class="sourceLineNo">504</span>      }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    } catch (NumberFormatException e) {<a 
name="line.505"></a>
+<span class="sourceLineNo">506</span>      log.error("Could not parse the 
value provided for the infoport option", e);<a name="line.506"></a>
+<span class="sourceLineNo">507</span>      printUsage();<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      System.exit(1);<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>    }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span>    // Put up info server.<a 
name="line.511"></a>
+<span class="sourceLineNo">512</span>    startInfoServer(conf);<a 
name="line.512"></a>
+<span class="sourceLineNo">513</span><a name="line.513"></a>
+<span class="sourceLineNo">514</span>    final TServer tserver = 
getServer(workerThreads, selectorThreads, maxCallQueueSize, readTimeout,<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>            backlog, nonblocking, hsha, 
selector, metrics, protocolFactory, processor,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>            transportFactory, 
inetSocketAddress);<a name="line.516"></a>
+<span class="sourceLineNo">517</span><a name="line.517"></a>
+<span class="sourceLineNo">518</span>    realUser.doAs(<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      new 
PrivilegedAction&lt;Object&gt;() {<a name="line.519"></a>
+<span class="sourceLineNo">520</span>        @Override<a name="line.520"></a>
+<span class="sourceLineNo">521</span>        public Object run() {<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span>          pauseMonitor.start();<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span>          try {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>            tserver.serve();<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>            return null;<a 
name="line.525"></a>
+<span class="sourceLineNo">526</span>          } finally {<a 
name="line.526"></a>
+<span class="sourceLineNo">527</span>            pauseMonitor.stop();<a 
name="line.527"></a>
+<span class="sourceLineNo">528</span>          }<a name="line.528"></a>
+<span class="sourceLineNo">529</span>        }<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      });<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    // when tserver.stop eventually 
happens we'll get here.<a name="line.531"></a>
+<span class="sourceLineNo">532</span>    return 0;<a name="line.532"></a>
+<span class="sourceLineNo">533</span>  }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span>  private String getImplType(boolean 
nonblocking, boolean hsha, boolean selector) {<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    String implType = "threadpool";<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span><a name="line.537"></a>
+<span class="sourceLineNo">538</span>    if (nonblocking) {<a 
name="line.538"></a>
+<span class="sourceLineNo">539</span>      implType = "nonblocking";<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>    } else if (hsha) {<a 
name="line.540"></a>
+<span class="sourceLineNo">541</span>      implType = "hsha";<a 
name="line.541"></a>
+<span class="sourceLineNo">542</span>    } else if (selector) {<a 
name="line.542"></a>
+<span class="sourceLineNo">543</span>      implType = "selector";<a 
name="line.543"></a>
+<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
+<span class="sourceLineNo">545</span><a name="line.545"></a>
+<span class="sourceLineNo">546</span>    return implType;<a 
name="line.546"></a>
+<span class="sourceLineNo">547</span>  }<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>  private String 
getBindAddress(Configuration conf, CommandLine cmd) {<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    String bindAddress;<a 
name="line.550"></a>
+<span class="sourceLineNo">551</span>    if (cmd.hasOption("bind")) {<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>      bindAddress = 
cmd.getOptionValue("bind");<a name="line.552"></a>
+<span class="sourceLineNo">553</span>      
conf.set("hbase.thrift.info.bindAddress", bindAddress);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>    } else {<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      bindAddress = 
conf.get("hbase.thrift.info.bindAddress");<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    }<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    return bindAddress;<a 
name="line.557"></a>
+<span class="sourceLineNo">558</span>  }<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span>  private int getListenPort(Configuration 
conf, CommandLine cmd) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    int listenPort;<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    try {<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      if (cmd.hasOption("port")) {<a 
name="line.563"></a>
+<span class="sourceLineNo">564</span>        listenPort = 
Integer.parseInt(cmd.getOptionValue("port"));<a name="line.564"></a>
+<span class="sourceLineNo">565</span>      } else {<a name="line.565"></a>
+<span class="sourceLineNo">566</span>        listenPort = 
conf.getInt("hbase.regionserver.thrift.port", DEFAULT_LISTEN_PORT);<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span>      }<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    } catch (NumberFormatException e) {<a 
name="line.568"></a>
+<span class="sourceLineNo">569</span>      throw new RuntimeException("Could 
not parse the value provided for the port option", e);<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>    return listenPort;<a 
name="line.571"></a>
+<span class="sourceLineNo">572</span>  }<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>  private int 
getReadTimeout(Configuration conf, CommandLine cmd) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>    int readTimeout;<a 
name="line.575"></a>
+<span class="sourceLineNo">576</span>    if 
(cmd.hasOption(READ_TIMEOUT_OPTION)) {<a name="line.576"></a>
+<span class="sourceLineNo">577</span>      try {<a name="line.577"></a>
+<span class="sourceLineNo">578</span>        readTimeout = 
Integer.parseInt(cmd.getOptionValue(READ_TIMEOUT_OPTION));<a 
name="line.578"></a>
+<span class="sourceLineNo">579</span>      } catch (NumberFormatException e) 
{<a name="line.579"></a>
+<span class="sourceLineNo">580</span>        throw new RuntimeException("Could 
not parse the value provided for the timeout option", e);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>      }<a name="line.581"></a>
+<span class="sourceLineNo">582</span>    } else {<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      readTimeout = 
conf.getInt(THRIFT_SERVER_SOCKET_READ_TIMEOUT_KEY,<a name="line.583"></a>
+<span class="sourceLineNo">584</span>        
THRIFT_SERVER_SOCKET_READ_TIMEOUT_DEFAULT);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    }<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    return readTimeout;<a 
name="line.586"></a>
+<span class="sourceLineNo">587</span>  }<a name="line.587"></a>
+<span class="sourceLineNo">588</span><a name="line.588"></a>
+<span class="sourceLineNo">589</span>  private void 
startInfoServer(Configuration conf) throws IOException {<a name="line.589"></a>
+<span class="sourceLineNo">590</span>    int port = 
conf.getInt("hbase.thrift.info.port", 9095);<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span>    if (port &gt;= 0) {<a 
name="line.592"></a>
+<span class="sourceLineNo">593</span>      conf.setLong("startcode", 
System.currentTimeMillis());<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      String a = 
conf.get("hbase.thrift.info.bindAddress", "0.0.0.0");<a name="line.594"></a>
+<span class="sourceLineNo">595</span>      InfoServer infoServer = new 
InfoServer("thrift", a, port, false, conf);<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      
infoServer.setAttribute("hbase.conf", conf);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      infoServer.start();<a 
name="line.597"></a>
+<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
 <span class="sourceLineNo">599</span>  }<a name="line.599"></a>
 <span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>  private void 
startInfoServer(Configuration conf) throws IOException {<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    int port = 
conf.getInt("hbase.thrift.info.port", 9095);<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>    if (port &gt;= 0) {<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>      conf.setLong("startcode", 
System.currentTimeMillis());<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      String a = 
conf.get("hbase.thrift.info.bindAddress", "0.0.0.0");<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      InfoServer infoServer = new 
InfoServer("thrift", a, port, false, conf);<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      
infoServer.setAttribute("hbase.conf", conf);<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      infoServer.start();<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>    }<a name="line.610"></a>
-<span class="sourceLineNo">611</span>  }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span>  private TServer getServer(int 
workerThreads, int selectorThreads, int maxCallQueueSize,<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        int readTimeout, int backlog, 
boolean nonblocking, boolean hsha, boolean selector,<a name="line.614"></a>
-<span class="sourceLineNo">615</span>        ThriftMetrics metrics, 
TProtocolFactory protocolFactory, TProcessor processor,<a name="line.615"></a>
-<span class="sourceLineNo">616</span>        TTransportFactory 
transportFactory, InetSocketAddress inetSocketAddress)<a name="line.616"></a>
-<span class="sourceLineNo">617</span>          throws TTransportException {<a 
name="line.617"></a>
-<span class="sourceLineNo">618</span>    TServer server;<a name="line.618"></a>
-<span class="sourceLineNo">619</span><a name="line.619"></a>
-<span class="sourceLineNo">620</span>    if (nonblocking) {<a 
name="line.620"></a>
-<span class="sourceLineNo">621</span>      server = 
getTNonBlockingServer(protocolFactory, processor, transportFactory,<a 
name="line.621"></a>
-<span class="sourceLineNo">622</span>              inetSocketAddress);<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>    } else if (hsha) {<a 
name="line.623"></a>
-<span class="sourceLineNo">624</span>      server = 
getTHsHaServer(protocolFactory, processor, transportFactory, workerThreads,<a 
name="line.624"></a>
-<span class="sourceLineNo">625</span>              maxCallQueueSize, 
inetSocketAddress, metrics);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>    } else if (selector) {<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>      server = 
getTThreadedSelectorServer(protocolFactory, processor, transportFactory,<a 
name="line.627"></a>
-<span class="sourceLineNo">628</span>              workerThreads, 
selectorThreads, maxCallQueueSize, inetSocketAddress, metrics);<a 
name="line.628"></a>
-<span class="sourceLineNo">629</span>    } else {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      server = 
getTThreadPoolServer(protocolFactory, processor, transportFactory, 
workerThreads,<a name="line.630"></a>
-<span class="sourceLineNo">631</span>              inetSocketAddress, backlog, 
readTimeout, metrics);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    }<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    return server;<a name="line.633"></a>
-<span class="sourceLineNo">634</span>  }<a name="line.634"></a>
-<span class="sourceLineNo">635</span>}<a name="line.635"></a>
+<span class="sourceLineNo">601</span>  private TServer getServer(int 
workerThreads, int selectorThreads, int maxCallQueueSize,<a name="line.601"></a>
+<span class="sourceLineNo">602</span>        int readTimeout, int backlog, 
boolean nonblocking, boolean hsha, boolean selector,<a name="line.602"></a>
+<span class="sourceLineNo">603</span>        ThriftMetrics metrics, 
TProtocolFactory protocolFactory, TProcessor processor,<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        TTransportFactory 
transportFactory, InetSocketAddress inetSocketAddress)<a name="line.604"></a>
+<span class="sourceLineNo">605</span>          throws TTransportException {<a 
name="line.605"></a>
+<span class="sourceLineNo">606</span>    TServer server;<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>    if (nonblocking) {<a 
name="line.608"></a>
+<span class="sourceLineNo">609</span>      server = 
getTNonBlockingServer(protocolFactory, processor, transportFactory,<a 
name="line.609"></a>
+<span class="sourceLineNo">610</span>              inetSocketAddress);<a 
name="line.610"></a>
+<span class="sourceLineNo">611</span>    } else if (hsha) {<a 
name="line.611"></a>
+<span class="sourceLineNo">612</span>      server = 
getTHsHaServer(protocolFactory, processor, transportFactory, workerThreads,<a 
name="line.612"></a>
+<span class="sourceLineNo">613</span>              maxCallQueueSize, 
inetSocketAddress, metrics);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    } else if (selector) {<a 
name="line.614"></a>
+<span class="sourceLineNo">615</span>      server = 
getTThreadedSelectorServer(protocolFactory, processor, transportFactory,<a 
name="line.615"></a>
+<span class="sourceLineNo">616</span>              workerThreads, 
selectorThreads, maxCallQueueSize, inetSocketAddress, metrics);<a 
name="line.616"></a>
+<span class="sourceLineNo">617</span>    } else {<a name="line.617"></a>
+<span class="sourceLineNo">618</span>      server = 
getTThreadPoolServer(protocolFactory, processor, transportFactory, 
workerThreads,<a name="line.618"></a>
+<span class="sourceLineNo">619</span>              inetSocketAddress, backlog, 
readTimeout, metrics);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    return server;<a name="line.621"></a>
+<span class="sourceLineNo">622</span>  }<a name="line.622"></a>
+<span class="sourceLineNo">623</span>}<a name="line.623"></a>
 
 
 

Reply via email to