You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/02/11 18:34:43 UTC
[37/51] [partial] hbase-site git commit: Published site at
29a192ef3cbe3b9cc12a6ee38f39e1199ac9790f.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.BlockingRpcChannelImplementation.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.BlockingRpcChannelImplementation.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.BlockingRpcChannelImplementation.html
index f9da92e..d77d3ab 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.BlockingRpcChannelImplementation.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.BlockingRpcChannelImplementation.html
@@ -157,184 +157,189 @@
<span class="sourceLineNo">149</span> }<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> /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Encapsulate the ugly casting and RuntimeException conversion in private method.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param conf configuration<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return The compressor to use on this client.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> private static CompressionCodec getCompressor(final Configuration conf) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> String className = conf.get("hbase.client.rpc.compressor", null);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (className == null || className.isEmpty()) return null;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> try {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return (CompressionCodec)Class.forName(className).newInstance();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> } catch (Exception e) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> throw new RuntimeException("Failed getting compressor " + className, e);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * Return the pool type specified in the configuration, which must be set to<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * either {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal},<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * otherwise default to the former.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * For applications with many user threads, use a small round-robin pool. For<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * applications with few user threads, you may want to try using a<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * thread-local pool. In any case, the number of {@link org.apache.hadoop.hbase.ipc.RpcClient}<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * instances should not exceed the operating system's hard limit on the number of<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * connections.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> *<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @param config configuration<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @return either a {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal}<a name="line.181"></a>
-<span class="sourceLineNo">182</span> */<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected static PoolMap.PoolType getPoolType(Configuration config) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return PoolMap.PoolType<a name="line.184"></a>
-<span class="sourceLineNo">185</span> .valueOf(config.get(HConstants.HBASE_CLIENT_IPC_POOL_TYPE), PoolMap.PoolType.RoundRobin,<a name="line.185"></a>
-<span class="sourceLineNo">186</span> PoolMap.PoolType.ThreadLocal);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * Return the pool size specified in the configuration, which is applicable only if<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * the pool type is {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin}.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> *<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * @param config configuration<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @return the maximum pool size<a name="line.194"></a>
-<span class="sourceLineNo">195</span> */<a name="line.195"></a>
-<span class="sourceLineNo">196</span> protected static int getPoolSize(Configuration config) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return config.getInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, 1);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<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> * Make a blocking call. Throws exceptions if there are network problems or if the remote code<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * threw an exception.<a name="line.202"></a>
-<span class="sourceLineNo">203</span> *<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * will be a<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * new Connection each time.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Message callBlockingMethod(Descriptors.MethodDescriptor md, PayloadCarryingRpcController pcrc,<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Message param, Message returnType, final User ticket, final InetSocketAddress isa)<a name="line.211"></a>
-<span class="sourceLineNo">212</span> throws ServiceException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> if (pcrc == null) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> pcrc = new PayloadCarryingRpcController();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> Pair<Message, CellScanner> val;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> try {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> final MetricsConnection.CallStats cs = MetricsConnection.newCallStats();<a name="line.219"></a>
-<span class="sourceLineNo">220</span> cs.setStartTime(EnvironmentEdgeManager.currentTime());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> val = call(pcrc, md, param, returnType, ticket, isa, cs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> // Shove the results into controller so can be carried across the proxy/pb service void.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> pcrc.setCellScanner(val.getSecond());<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> cs.setCallTimeMs(EnvironmentEdgeManager.currentTime() - cs.getStartTime());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (metrics != null) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> metrics.updateRpc(md, param, cs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> if (LOG.isTraceEnabled()) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.trace("Call: " + md.getName() + ", callTime: " + cs.getCallTimeMs() + "ms");<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> return val.getFirst();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (Throwable e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw new ServiceException(e);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * Make a call, passing <code>param</code>, to the IPC server running at<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <code>address</code> which is servicing the <code>protocol</code> protocol,<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * with the <code>ticket</code> credentials, returning the value.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * Throws exceptions if there are network problems or if the remote code<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * threw an exception.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> *<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * will be a<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * new Connection each time.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * @throws InterruptedException<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @throws java.io.IOException<a name="line.251"></a>
-<span class="sourceLineNo">252</span> */<a name="line.252"></a>
-<span class="sourceLineNo">253</span> protected abstract Pair<Message, CellScanner> call(PayloadCarryingRpcController pcrc,<a name="line.253"></a>
-<span class="sourceLineNo">254</span> Descriptors.MethodDescriptor md, Message param, Message returnType, User ticket,<a name="line.254"></a>
-<span class="sourceLineNo">255</span> InetSocketAddress isa, MetricsConnection.CallStats callStats)<a name="line.255"></a>
-<span class="sourceLineNo">256</span> throws IOException, InterruptedException;<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public BlockingRpcChannel createBlockingRpcChannel(final ServerName sn, final User ticket,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> int defaultOperationTimeout) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return new BlockingRpcChannelImplementation(this, sn, ticket, defaultOperationTimeout);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> /**<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * Takes an Exception and the address we were trying to connect to and return an IOException with<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * the input exception as the cause. The new exception provides the stack trace of the place where<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * the exception is thrown and some extra diagnostics information. If the exception is<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * ConnectException or SocketTimeoutException, return a new one of the same type; Otherwise return<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * an IOException.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> * @param addr target address<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @param exception the relevant exception<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * @return an exception to throw<a name="line.272"></a>
-<span class="sourceLineNo">273</span> */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> protected IOException wrapException(InetSocketAddress addr, Exception exception) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (exception instanceof ConnectException) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> // connection refused; include the host:port in the error<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return (ConnectException) new ConnectException("Call to " + addr<a name="line.277"></a>
-<span class="sourceLineNo">278</span> + " failed on connection exception: " + exception).initCause(exception);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } else if (exception instanceof SocketTimeoutException) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return (SocketTimeoutException) new SocketTimeoutException("Call to " + addr<a name="line.280"></a>
-<span class="sourceLineNo">281</span> + " failed because " + exception).initCause(exception);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> } else if (exception instanceof ConnectionClosingException) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return (ConnectionClosingException) new ConnectionClosingException("Call to " + addr<a name="line.283"></a>
-<span class="sourceLineNo">284</span> + " failed on local exception: " + exception).initCause(exception);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> } else {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return (IOException) new IOException("Call to " + addr + " failed on local exception: "<a name="line.286"></a>
-<span class="sourceLineNo">287</span> + exception).initCause(exception);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Blocking rpc channel that goes via hbase rpc.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> */<a name="line.293"></a>
-<span class="sourceLineNo">294</span> @VisibleForTesting<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public static class BlockingRpcChannelImplementation implements BlockingRpcChannel {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> private final InetSocketAddress isa;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> private final AbstractRpcClient rpcClient;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> private final User ticket;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> private final int channelOperationTimeout;<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @param channelOperationTimeout - the default timeout when no timeout is given<a name="line.302"></a>
-<span class="sourceLineNo">303</span> */<a name="line.303"></a>
-<span class="sourceLineNo">304</span> protected BlockingRpcChannelImplementation(final AbstractRpcClient rpcClient,<a name="line.304"></a>
-<span class="sourceLineNo">305</span> final ServerName sn, final User ticket, int channelOperationTimeout) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> this.isa = new InetSocketAddress(sn.getHostname(), sn.getPort());<a name="line.306"></a>
-<span class="sourceLineNo">307</span> this.rpcClient = rpcClient;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> this.ticket = ticket;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> this.channelOperationTimeout = channelOperationTimeout;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public Message callBlockingMethod(Descriptors.MethodDescriptor md, RpcController controller,<a name="line.313"></a>
-<span class="sourceLineNo">314</span> Message param, Message returnType) throws ServiceException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> PayloadCarryingRpcController pcrc;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (controller != null) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> pcrc = (PayloadCarryingRpcController) controller;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> if (!pcrc.hasCallTimeout()) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> } else {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> pcrc = new PayloadCarryingRpcController();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>}<a name="line.329"></a>
+<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public boolean hasCellBlockSupport() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return this.codec != null;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * Encapsulate the ugly casting and RuntimeException conversion in private method.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * @param conf configuration<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @return The compressor to use on this client.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> private static CompressionCodec getCompressor(final Configuration conf) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> String className = conf.get("hbase.client.rpc.compressor", null);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> if (className == null || className.isEmpty()) return null;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> try {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return (CompressionCodec)Class.forName(className).newInstance();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (Exception e) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> throw new RuntimeException("Failed getting compressor " + className, e);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * Return the pool type specified in the configuration, which must be set to<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * either {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal},<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * otherwise default to the former.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> *<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * For applications with many user threads, use a small round-robin pool. For<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * applications with few user threads, you may want to try using a<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * thread-local pool. In any case, the number of {@link org.apache.hadoop.hbase.ipc.RpcClient}<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * instances should not exceed the operating system's hard limit on the number of<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * connections.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> *<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param config configuration<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @return either a {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal}<a name="line.186"></a>
+<span class="sourceLineNo">187</span> */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> protected static PoolMap.PoolType getPoolType(Configuration config) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> return PoolMap.PoolType<a name="line.189"></a>
+<span class="sourceLineNo">190</span> .valueOf(config.get(HConstants.HBASE_CLIENT_IPC_POOL_TYPE), PoolMap.PoolType.RoundRobin,<a name="line.190"></a>
+<span class="sourceLineNo">191</span> PoolMap.PoolType.ThreadLocal);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> /**<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * Return the pool size specified in the configuration, which is applicable only if<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * the pool type is {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin}.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> *<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @param config configuration<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @return the maximum pool size<a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> protected static int getPoolSize(Configuration config) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return config.getInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, 1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Make a blocking call. Throws exceptions if there are network problems or if the remote code<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * threw an exception.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> *<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * will be a<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * new Connection each time.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.213"></a>
+<span class="sourceLineNo">214</span> */<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Message callBlockingMethod(Descriptors.MethodDescriptor md, PayloadCarryingRpcController pcrc,<a name="line.215"></a>
+<span class="sourceLineNo">216</span> Message param, Message returnType, final User ticket, final InetSocketAddress isa)<a name="line.216"></a>
+<span class="sourceLineNo">217</span> throws ServiceException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (pcrc == null) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> pcrc = new PayloadCarryingRpcController();<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> Pair<Message, CellScanner> val;<a name="line.222"></a>
+<span class="sourceLineNo">223</span> try {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> final MetricsConnection.CallStats cs = MetricsConnection.newCallStats();<a name="line.224"></a>
+<span class="sourceLineNo">225</span> cs.setStartTime(EnvironmentEdgeManager.currentTime());<a name="line.225"></a>
+<span class="sourceLineNo">226</span> val = call(pcrc, md, param, returnType, ticket, isa, cs);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // Shove the results into controller so can be carried across the proxy/pb service void.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> pcrc.setCellScanner(val.getSecond());<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> cs.setCallTimeMs(EnvironmentEdgeManager.currentTime() - cs.getStartTime());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (metrics != null) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> metrics.updateRpc(md, param, cs);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (LOG.isTraceEnabled()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> LOG.trace("Call: " + md.getName() + ", callTime: " + cs.getCallTimeMs() + "ms");<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return val.getFirst();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> } catch (Throwable e) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> throw new ServiceException(e);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * Make a call, passing <code>param</code>, to the IPC server running at<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <code>address</code> which is servicing the <code>protocol</code> protocol,<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * with the <code>ticket</code> credentials, returning the value.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Throws exceptions if there are network problems or if the remote code<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * threw an exception.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> *<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * will be a<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * new Connection each time.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @throws InterruptedException<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @throws java.io.IOException<a name="line.256"></a>
+<span class="sourceLineNo">257</span> */<a name="line.257"></a>
+<span class="sourceLineNo">258</span> protected abstract Pair<Message, CellScanner> call(PayloadCarryingRpcController pcrc,<a name="line.258"></a>
+<span class="sourceLineNo">259</span> Descriptors.MethodDescriptor md, Message param, Message returnType, User ticket,<a name="line.259"></a>
+<span class="sourceLineNo">260</span> InetSocketAddress isa, MetricsConnection.CallStats callStats)<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throws IOException, InterruptedException;<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> @Override<a name="line.263"></a>
+<span class="sourceLineNo">264</span> public BlockingRpcChannel createBlockingRpcChannel(final ServerName sn, final User ticket,<a name="line.264"></a>
+<span class="sourceLineNo">265</span> int defaultOperationTimeout) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return new BlockingRpcChannelImplementation(this, sn, ticket, defaultOperationTimeout);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * Takes an Exception and the address we were trying to connect to and return an IOException with<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * the input exception as the cause. The new exception provides the stack trace of the place where<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * the exception is thrown and some extra diagnostics information. If the exception is<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * ConnectException or SocketTimeoutException, return a new one of the same type; Otherwise return<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * an IOException.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param addr target address<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @param exception the relevant exception<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * @return an exception to throw<a name="line.277"></a>
+<span class="sourceLineNo">278</span> */<a name="line.278"></a>
+<span class="sourceLineNo">279</span> protected IOException wrapException(InetSocketAddress addr, Exception exception) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (exception instanceof ConnectException) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> // connection refused; include the host:port in the error<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return (ConnectException) new ConnectException("Call to " + addr<a name="line.282"></a>
+<span class="sourceLineNo">283</span> + " failed on connection exception: " + exception).initCause(exception);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> } else if (exception instanceof SocketTimeoutException) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return (SocketTimeoutException) new SocketTimeoutException("Call to " + addr<a name="line.285"></a>
+<span class="sourceLineNo">286</span> + " failed because " + exception).initCause(exception);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> } else if (exception instanceof ConnectionClosingException) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return (ConnectionClosingException) new ConnectionClosingException("Call to " + addr<a name="line.288"></a>
+<span class="sourceLineNo">289</span> + " failed on local exception: " + exception).initCause(exception);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> } else {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return (IOException) new IOException("Call to " + addr + " failed on local exception: "<a name="line.291"></a>
+<span class="sourceLineNo">292</span> + exception).initCause(exception);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> /**<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * Blocking rpc channel that goes via hbase rpc.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> @VisibleForTesting<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public static class BlockingRpcChannelImplementation implements BlockingRpcChannel {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> private final InetSocketAddress isa;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> private final AbstractRpcClient rpcClient;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> private final User ticket;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> private final int channelOperationTimeout;<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * @param channelOperationTimeout - the default timeout when no timeout is given<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> protected BlockingRpcChannelImplementation(final AbstractRpcClient rpcClient,<a name="line.309"></a>
+<span class="sourceLineNo">310</span> final ServerName sn, final User ticket, int channelOperationTimeout) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> this.isa = new InetSocketAddress(sn.getHostname(), sn.getPort());<a name="line.311"></a>
+<span class="sourceLineNo">312</span> this.rpcClient = rpcClient;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> this.ticket = ticket;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> this.channelOperationTimeout = channelOperationTimeout;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public Message callBlockingMethod(Descriptors.MethodDescriptor md, RpcController controller,<a name="line.318"></a>
+<span class="sourceLineNo">319</span> Message param, Message returnType) throws ServiceException {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> PayloadCarryingRpcController pcrc;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (controller != null) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> pcrc = (PayloadCarryingRpcController) controller;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (!pcrc.hasCallTimeout()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> pcrc = new PayloadCarryingRpcController();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>}<a name="line.334"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.html
index f9da92e..d77d3ab 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/AbstractRpcClient.html
@@ -157,184 +157,189 @@
<span class="sourceLineNo">149</span> }<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> /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span> * Encapsulate the ugly casting and RuntimeException conversion in private method.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> * @param conf configuration<a name="line.154"></a>
-<span class="sourceLineNo">155</span> * @return The compressor to use on this client.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> */<a name="line.156"></a>
-<span class="sourceLineNo">157</span> private static CompressionCodec getCompressor(final Configuration conf) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> String className = conf.get("hbase.client.rpc.compressor", null);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (className == null || className.isEmpty()) return null;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> try {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return (CompressionCodec)Class.forName(className).newInstance();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> } catch (Exception e) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> throw new RuntimeException("Failed getting compressor " + className, e);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * Return the pool type specified in the configuration, which must be set to<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * either {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal},<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * otherwise default to the former.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * For applications with many user threads, use a small round-robin pool. For<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * applications with few user threads, you may want to try using a<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * thread-local pool. In any case, the number of {@link org.apache.hadoop.hbase.ipc.RpcClient}<a name="line.175"></a>
-<span class="sourceLineNo">176</span> * instances should not exceed the operating system's hard limit on the number of<a name="line.176"></a>
-<span class="sourceLineNo">177</span> * connections.<a name="line.177"></a>
-<span class="sourceLineNo">178</span> *<a name="line.178"></a>
-<span class="sourceLineNo">179</span> * @param config configuration<a name="line.179"></a>
-<span class="sourceLineNo">180</span> * @return either a {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.180"></a>
-<span class="sourceLineNo">181</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal}<a name="line.181"></a>
-<span class="sourceLineNo">182</span> */<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected static PoolMap.PoolType getPoolType(Configuration config) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return PoolMap.PoolType<a name="line.184"></a>
-<span class="sourceLineNo">185</span> .valueOf(config.get(HConstants.HBASE_CLIENT_IPC_POOL_TYPE), PoolMap.PoolType.RoundRobin,<a name="line.185"></a>
-<span class="sourceLineNo">186</span> PoolMap.PoolType.ThreadLocal);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> /**<a name="line.189"></a>
-<span class="sourceLineNo">190</span> * Return the pool size specified in the configuration, which is applicable only if<a name="line.190"></a>
-<span class="sourceLineNo">191</span> * the pool type is {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin}.<a name="line.191"></a>
-<span class="sourceLineNo">192</span> *<a name="line.192"></a>
-<span class="sourceLineNo">193</span> * @param config configuration<a name="line.193"></a>
-<span class="sourceLineNo">194</span> * @return the maximum pool size<a name="line.194"></a>
-<span class="sourceLineNo">195</span> */<a name="line.195"></a>
-<span class="sourceLineNo">196</span> protected static int getPoolSize(Configuration config) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> return config.getInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, 1);<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<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> * Make a blocking call. Throws exceptions if there are network problems or if the remote code<a name="line.201"></a>
-<span class="sourceLineNo">202</span> * threw an exception.<a name="line.202"></a>
-<span class="sourceLineNo">203</span> *<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * will be a<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * new Connection each time.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> Message callBlockingMethod(Descriptors.MethodDescriptor md, PayloadCarryingRpcController pcrc,<a name="line.210"></a>
-<span class="sourceLineNo">211</span> Message param, Message returnType, final User ticket, final InetSocketAddress isa)<a name="line.211"></a>
-<span class="sourceLineNo">212</span> throws ServiceException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> if (pcrc == null) {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> pcrc = new PayloadCarryingRpcController();<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> Pair<Message, CellScanner> val;<a name="line.217"></a>
-<span class="sourceLineNo">218</span> try {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> final MetricsConnection.CallStats cs = MetricsConnection.newCallStats();<a name="line.219"></a>
-<span class="sourceLineNo">220</span> cs.setStartTime(EnvironmentEdgeManager.currentTime());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> val = call(pcrc, md, param, returnType, ticket, isa, cs);<a name="line.221"></a>
-<span class="sourceLineNo">222</span> // Shove the results into controller so can be carried across the proxy/pb service void.<a name="line.222"></a>
-<span class="sourceLineNo">223</span> pcrc.setCellScanner(val.getSecond());<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> cs.setCallTimeMs(EnvironmentEdgeManager.currentTime() - cs.getStartTime());<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (metrics != null) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> metrics.updateRpc(md, param, cs);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> if (LOG.isTraceEnabled()) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> LOG.trace("Call: " + md.getName() + ", callTime: " + cs.getCallTimeMs() + "ms");<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> return val.getFirst();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> } catch (Throwable e) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> throw new ServiceException(e);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span> * Make a call, passing <code>param</code>, to the IPC server running at<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * <code>address</code> which is servicing the <code>protocol</code> protocol,<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * with the <code>ticket</code> credentials, returning the value.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * Throws exceptions if there are network problems or if the remote code<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * threw an exception.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> *<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.246"></a>
-<span class="sourceLineNo">247</span> * will be a<a name="line.247"></a>
-<span class="sourceLineNo">248</span> * new Connection each time.<a name="line.248"></a>
-<span class="sourceLineNo">249</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.249"></a>
-<span class="sourceLineNo">250</span> * @throws InterruptedException<a name="line.250"></a>
-<span class="sourceLineNo">251</span> * @throws java.io.IOException<a name="line.251"></a>
-<span class="sourceLineNo">252</span> */<a name="line.252"></a>
-<span class="sourceLineNo">253</span> protected abstract Pair<Message, CellScanner> call(PayloadCarryingRpcController pcrc,<a name="line.253"></a>
-<span class="sourceLineNo">254</span> Descriptors.MethodDescriptor md, Message param, Message returnType, User ticket,<a name="line.254"></a>
-<span class="sourceLineNo">255</span> InetSocketAddress isa, MetricsConnection.CallStats callStats)<a name="line.255"></a>
-<span class="sourceLineNo">256</span> throws IOException, InterruptedException;<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span> @Override<a name="line.258"></a>
-<span class="sourceLineNo">259</span> public BlockingRpcChannel createBlockingRpcChannel(final ServerName sn, final User ticket,<a name="line.259"></a>
-<span class="sourceLineNo">260</span> int defaultOperationTimeout) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> return new BlockingRpcChannelImplementation(this, sn, ticket, defaultOperationTimeout);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> /**<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * Takes an Exception and the address we were trying to connect to and return an IOException with<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * the input exception as the cause. The new exception provides the stack trace of the place where<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * the exception is thrown and some extra diagnostics information. If the exception is<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * ConnectException or SocketTimeoutException, return a new one of the same type; Otherwise return<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * an IOException.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> * @param addr target address<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * @param exception the relevant exception<a name="line.271"></a>
-<span class="sourceLineNo">272</span> * @return an exception to throw<a name="line.272"></a>
-<span class="sourceLineNo">273</span> */<a name="line.273"></a>
-<span class="sourceLineNo">274</span> protected IOException wrapException(InetSocketAddress addr, Exception exception) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (exception instanceof ConnectException) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> // connection refused; include the host:port in the error<a name="line.276"></a>
-<span class="sourceLineNo">277</span> return (ConnectException) new ConnectException("Call to " + addr<a name="line.277"></a>
-<span class="sourceLineNo">278</span> + " failed on connection exception: " + exception).initCause(exception);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> } else if (exception instanceof SocketTimeoutException) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> return (SocketTimeoutException) new SocketTimeoutException("Call to " + addr<a name="line.280"></a>
-<span class="sourceLineNo">281</span> + " failed because " + exception).initCause(exception);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> } else if (exception instanceof ConnectionClosingException) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return (ConnectionClosingException) new ConnectionClosingException("Call to " + addr<a name="line.283"></a>
-<span class="sourceLineNo">284</span> + " failed on local exception: " + exception).initCause(exception);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> } else {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> return (IOException) new IOException("Call to " + addr + " failed on local exception: "<a name="line.286"></a>
-<span class="sourceLineNo">287</span> + exception).initCause(exception);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> /**<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * Blocking rpc channel that goes via hbase rpc.<a name="line.292"></a>
-<span class="sourceLineNo">293</span> */<a name="line.293"></a>
-<span class="sourceLineNo">294</span> @VisibleForTesting<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public static class BlockingRpcChannelImplementation implements BlockingRpcChannel {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> private final InetSocketAddress isa;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> private final AbstractRpcClient rpcClient;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> private final User ticket;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> private final int channelOperationTimeout;<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> /**<a name="line.301"></a>
-<span class="sourceLineNo">302</span> * @param channelOperationTimeout - the default timeout when no timeout is given<a name="line.302"></a>
-<span class="sourceLineNo">303</span> */<a name="line.303"></a>
-<span class="sourceLineNo">304</span> protected BlockingRpcChannelImplementation(final AbstractRpcClient rpcClient,<a name="line.304"></a>
-<span class="sourceLineNo">305</span> final ServerName sn, final User ticket, int channelOperationTimeout) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> this.isa = new InetSocketAddress(sn.getHostname(), sn.getPort());<a name="line.306"></a>
-<span class="sourceLineNo">307</span> this.rpcClient = rpcClient;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> this.ticket = ticket;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> this.channelOperationTimeout = channelOperationTimeout;<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span> public Message callBlockingMethod(Descriptors.MethodDescriptor md, RpcController controller,<a name="line.313"></a>
-<span class="sourceLineNo">314</span> Message param, Message returnType) throws ServiceException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> PayloadCarryingRpcController pcrc;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> if (controller != null) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> pcrc = (PayloadCarryingRpcController) controller;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> if (!pcrc.hasCallTimeout()) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> } else {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> pcrc = new PayloadCarryingRpcController();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>}<a name="line.329"></a>
+<span class="sourceLineNo">152</span> @Override<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public boolean hasCellBlockSupport() {<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return this.codec != null;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span> * Encapsulate the ugly casting and RuntimeException conversion in private method.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * @param conf configuration<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @return The compressor to use on this client.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> private static CompressionCodec getCompressor(final Configuration conf) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> String className = conf.get("hbase.client.rpc.compressor", null);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> if (className == null || className.isEmpty()) return null;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> try {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return (CompressionCodec)Class.forName(className).newInstance();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (Exception e) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> throw new RuntimeException("Failed getting compressor " + className, e);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * Return the pool type specified in the configuration, which must be set to<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * either {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal},<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * otherwise default to the former.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> *<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * For applications with many user threads, use a small round-robin pool. For<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * applications with few user threads, you may want to try using a<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * thread-local pool. In any case, the number of {@link org.apache.hadoop.hbase.ipc.RpcClient}<a name="line.180"></a>
+<span class="sourceLineNo">181</span> * instances should not exceed the operating system's hard limit on the number of<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * connections.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> *<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @param config configuration<a name="line.184"></a>
+<span class="sourceLineNo">185</span> * @return either a {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin} or<a name="line.185"></a>
+<span class="sourceLineNo">186</span> * {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#ThreadLocal}<a name="line.186"></a>
+<span class="sourceLineNo">187</span> */<a name="line.187"></a>
+<span class="sourceLineNo">188</span> protected static PoolMap.PoolType getPoolType(Configuration config) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> return PoolMap.PoolType<a name="line.189"></a>
+<span class="sourceLineNo">190</span> .valueOf(config.get(HConstants.HBASE_CLIENT_IPC_POOL_TYPE), PoolMap.PoolType.RoundRobin,<a name="line.190"></a>
+<span class="sourceLineNo">191</span> PoolMap.PoolType.ThreadLocal);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> /**<a name="line.194"></a>
+<span class="sourceLineNo">195</span> * Return the pool size specified in the configuration, which is applicable only if<a name="line.195"></a>
+<span class="sourceLineNo">196</span> * the pool type is {@link org.apache.hadoop.hbase.util.PoolMap.PoolType#RoundRobin}.<a name="line.196"></a>
+<span class="sourceLineNo">197</span> *<a name="line.197"></a>
+<span class="sourceLineNo">198</span> * @param config configuration<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @return the maximum pool size<a name="line.199"></a>
+<span class="sourceLineNo">200</span> */<a name="line.200"></a>
+<span class="sourceLineNo">201</span> protected static int getPoolSize(Configuration config) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> return config.getInt(HConstants.HBASE_CLIENT_IPC_POOL_SIZE, 1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span> /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Make a blocking call. Throws exceptions if there are network problems or if the remote code<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * threw an exception.<a name="line.207"></a>
+<span class="sourceLineNo">208</span> *<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.210"></a>
+<span class="sourceLineNo">211</span> * will be a<a name="line.211"></a>
+<span class="sourceLineNo">212</span> * new Connection each time.<a name="line.212"></a>
+<span class="sourceLineNo">213</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.213"></a>
+<span class="sourceLineNo">214</span> */<a name="line.214"></a>
+<span class="sourceLineNo">215</span> Message callBlockingMethod(Descriptors.MethodDescriptor md, PayloadCarryingRpcController pcrc,<a name="line.215"></a>
+<span class="sourceLineNo">216</span> Message param, Message returnType, final User ticket, final InetSocketAddress isa)<a name="line.216"></a>
+<span class="sourceLineNo">217</span> throws ServiceException {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (pcrc == null) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> pcrc = new PayloadCarryingRpcController();<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> Pair<Message, CellScanner> val;<a name="line.222"></a>
+<span class="sourceLineNo">223</span> try {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> final MetricsConnection.CallStats cs = MetricsConnection.newCallStats();<a name="line.224"></a>
+<span class="sourceLineNo">225</span> cs.setStartTime(EnvironmentEdgeManager.currentTime());<a name="line.225"></a>
+<span class="sourceLineNo">226</span> val = call(pcrc, md, param, returnType, ticket, isa, cs);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // Shove the results into controller so can be carried across the proxy/pb service void.<a name="line.227"></a>
+<span class="sourceLineNo">228</span> pcrc.setCellScanner(val.getSecond());<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> cs.setCallTimeMs(EnvironmentEdgeManager.currentTime() - cs.getStartTime());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> if (metrics != null) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> metrics.updateRpc(md, param, cs);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (LOG.isTraceEnabled()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> LOG.trace("Call: " + md.getName() + ", callTime: " + cs.getCallTimeMs() + "ms");<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> return val.getFirst();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> } catch (Throwable e) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> throw new ServiceException(e);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> /**<a name="line.243"></a>
+<span class="sourceLineNo">244</span> * Make a call, passing <code>param</code>, to the IPC server running at<a name="line.244"></a>
+<span class="sourceLineNo">245</span> * <code>address</code> which is servicing the <code>protocol</code> protocol,<a name="line.245"></a>
+<span class="sourceLineNo">246</span> * with the <code>ticket</code> credentials, returning the value.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> * Throws exceptions if there are network problems or if the remote code<a name="line.247"></a>
+<span class="sourceLineNo">248</span> * threw an exception.<a name="line.248"></a>
+<span class="sourceLineNo">249</span> *<a name="line.249"></a>
+<span class="sourceLineNo">250</span> * @param ticket Be careful which ticket you pass. A new user will mean a new Connection.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * {@link UserProvider#getCurrent()} makes a new instance of User each time so<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * will be a<a name="line.252"></a>
+<span class="sourceLineNo">253</span> * new Connection each time.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * @return A pair with the Message response and the Cell data (if any).<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @throws InterruptedException<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @throws java.io.IOException<a name="line.256"></a>
+<span class="sourceLineNo">257</span> */<a name="line.257"></a>
+<span class="sourceLineNo">258</span> protected abstract Pair<Message, CellScanner> call(PayloadCarryingRpcController pcrc,<a name="line.258"></a>
+<span class="sourceLineNo">259</span> Descriptors.MethodDescriptor md, Message param, Message returnType, User ticket,<a name="line.259"></a>
+<span class="sourceLineNo">260</span> InetSocketAddress isa, MetricsConnection.CallStats callStats)<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throws IOException, InterruptedException;<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> @Override<a name="line.263"></a>
+<span class="sourceLineNo">264</span> public BlockingRpcChannel createBlockingRpcChannel(final ServerName sn, final User ticket,<a name="line.264"></a>
+<span class="sourceLineNo">265</span> int defaultOperationTimeout) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> return new BlockingRpcChannelImplementation(this, sn, ticket, defaultOperationTimeout);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * Takes an Exception and the address we were trying to connect to and return an IOException with<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * the input exception as the cause. The new exception provides the stack trace of the place where<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * the exception is thrown and some extra diagnostics information. If the exception is<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * ConnectException or SocketTimeoutException, return a new one of the same type; Otherwise return<a name="line.273"></a>
+<span class="sourceLineNo">274</span> * an IOException.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> * @param addr target address<a name="line.275"></a>
+<span class="sourceLineNo">276</span> * @param exception the relevant exception<a name="line.276"></a>
+<span class="sourceLineNo">277</span> * @return an exception to throw<a name="line.277"></a>
+<span class="sourceLineNo">278</span> */<a name="line.278"></a>
+<span class="sourceLineNo">279</span> protected IOException wrapException(InetSocketAddress addr, Exception exception) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (exception instanceof ConnectException) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> // connection refused; include the host:port in the error<a name="line.281"></a>
+<span class="sourceLineNo">282</span> return (ConnectException) new ConnectException("Call to " + addr<a name="line.282"></a>
+<span class="sourceLineNo">283</span> + " failed on connection exception: " + exception).initCause(exception);<a name="line.283"></a>
+<span class="sourceLineNo">284</span> } else if (exception instanceof SocketTimeoutException) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return (SocketTimeoutException) new SocketTimeoutException("Call to " + addr<a name="line.285"></a>
+<span class="sourceLineNo">286</span> + " failed because " + exception).initCause(exception);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> } else if (exception instanceof ConnectionClosingException) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> return (ConnectionClosingException) new ConnectionClosingException("Call to " + addr<a name="line.288"></a>
+<span class="sourceLineNo">289</span> + " failed on local exception: " + exception).initCause(exception);<a name="line.289"></a>
+<span class="sourceLineNo">290</span> } else {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return (IOException) new IOException("Call to " + addr + " failed on local exception: "<a name="line.291"></a>
+<span class="sourceLineNo">292</span> + exception).initCause(exception);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> /**<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * Blocking rpc channel that goes via hbase rpc.<a name="line.297"></a>
+<span class="sourceLineNo">298</span> */<a name="line.298"></a>
+<span class="sourceLineNo">299</span> @VisibleForTesting<a name="line.299"></a>
+<span class="sourceLineNo">300</span> public static class BlockingRpcChannelImplementation implements BlockingRpcChannel {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> private final InetSocketAddress isa;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> private final AbstractRpcClient rpcClient;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> private final User ticket;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> private final int channelOperationTimeout;<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * @param channelOperationTimeout - the default timeout when no timeout is given<a name="line.307"></a>
+<span class="sourceLineNo">308</span> */<a name="line.308"></a>
+<span class="sourceLineNo">309</span> protected BlockingRpcChannelImplementation(final AbstractRpcClient rpcClient,<a name="line.309"></a>
+<span class="sourceLineNo">310</span> final ServerName sn, final User ticket, int channelOperationTimeout) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> this.isa = new InetSocketAddress(sn.getHostname(), sn.getPort());<a name="line.311"></a>
+<span class="sourceLineNo">312</span> this.rpcClient = rpcClient;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> this.ticket = ticket;<a name="line.313"></a>
+<span class="sourceLineNo">314</span> this.channelOperationTimeout = channelOperationTimeout;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> @Override<a name="line.317"></a>
+<span class="sourceLineNo">318</span> public Message callBlockingMethod(Descriptors.MethodDescriptor md, RpcController controller,<a name="line.318"></a>
+<span class="sourceLineNo">319</span> Message param, Message returnType) throws ServiceException {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> PayloadCarryingRpcController pcrc;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (controller != null) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> pcrc = (PayloadCarryingRpcController) controller;<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (!pcrc.hasCallTimeout()) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> pcrc = new PayloadCarryingRpcController();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> pcrc.setCallTimeout(channelOperationTimeout);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa);<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>}<a name="line.334"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/devapidocs/src-html/org/apache/hadoop/hbase/ipc/RpcClient.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/RpcClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/RpcClient.html
index 7d4db73..016609c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/ipc/RpcClient.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/ipc/RpcClient.html
@@ -91,7 +91,13 @@
<span class="sourceLineNo">083</span> * using this client.<a name="line.83"></a>
<span class="sourceLineNo">084</span> */<a name="line.84"></a>
<span class="sourceLineNo">085</span> @Override public void close();<a name="line.85"></a>
-<span class="sourceLineNo">086</span>}<a name="line.86"></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> * @return true when this client uses a {@link org.apache.hadoop.hbase.codec.Codec} and so<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * supports cell blocks.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> */<a name="line.90"></a>
+<span class="sourceLineNo">091</span> boolean hasCellBlockSupport();<a name="line.91"></a>
+<span class="sourceLineNo">092</span>}<a name="line.92"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html
index 5344a96..6c2b2de 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.html
@@ -274,7 +274,7 @@
<span class="sourceLineNo">266</span> }<a name="line.266"></a>
<span class="sourceLineNo">267</span> List<InputSplit> splits = new ArrayList<InputSplit>(1);<a name="line.267"></a>
<span class="sourceLineNo">268</span> long regionSize = sizeCalculator.getRegionSize(regLoc.getRegionInfo().getRegionName());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> TableSplit split = new TableSplit(tableName,<a name="line.269"></a>
+<span class="sourceLineNo">269</span> TableSplit split = new TableSplit(tableName, scan,<a name="line.269"></a>
<span class="sourceLineNo">270</span> HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY, regLoc<a name="line.270"></a>
<span class="sourceLineNo">271</span> .getHostnamePort().split(Addressing.HOSTNAME_PORT_SEPARATOR)[0], regionSize);<a name="line.271"></a>
<span class="sourceLineNo">272</span> splits.add(split);<a name="line.272"></a>
@@ -317,7 +317,7 @@
<span class="sourceLineNo">309</span> <a name="line.309"></a>
<span class="sourceLineNo">310</span> byte[] regionName = location.getRegionInfo().getRegionName();<a name="line.310"></a>
<span class="sourceLineNo">311</span> long regionSize = sizeCalculator.getRegionSize(regionName);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> TableSplit split = new TableSplit(tableName,<a name="line.312"></a>
+<span class="sourceLineNo">312</span> TableSplit split = new TableSplit(tableName, scan,<a name="line.312"></a>
<span class="sourceLineNo">313</span> splitStart, splitStop, regionLocation, regionSize);<a name="line.313"></a>
<span class="sourceLineNo">314</span> splits.add(split);<a name="line.314"></a>
<span class="sourceLineNo">315</span> if (LOG.isDebugEnabled()) {<a name="line.315"></a>
@@ -405,9 +405,9 @@
<span class="sourceLineNo">397</span> byte[] splitKey = getSplitKey(ts.getStartRow(), ts.getEndRow(), isTextKey);<a name="line.397"></a>
<span class="sourceLineNo">398</span> //Set the size of child TableSplit as 1/2 of the region size. The exact size of the<a name="line.398"></a>
<span class="sourceLineNo">399</span> // MapReduce input splits is not far off.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> TableSplit t1 = new TableSplit(tableName, ts.getStartRow(), splitKey, regionLocation,<a name="line.400"></a>
+<span class="sourceLineNo">400</span> TableSplit t1 = new TableSplit(tableName, scan, ts.getStartRow(), splitKey, regionLocation,<a name="line.400"></a>
<span class="sourceLineNo">401</span> regionSize / 2);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> TableSplit t2 = new TableSplit(tableName, splitKey, ts.getEndRow(), regionLocation,<a name="line.402"></a>
+<span class="sourceLineNo">402</span> TableSplit t2 = new TableSplit(tableName, scan, splitKey, ts.getEndRow(), regionLocation,<a name="line.402"></a>
<span class="sourceLineNo">403</span> regionSize - regionSize / 2);<a name="line.403"></a>
<span class="sourceLineNo">404</span> resultList.add(t1);<a name="line.404"></a>
<span class="sourceLineNo">405</span> resultList.add(t2);<a name="line.405"></a>
@@ -434,7 +434,7 @@
<span class="sourceLineNo">426</span> break;<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> TableSplit t = new TableSplit(tableName, splitStartKey, splitEndKey,<a name="line.429"></a>
+<span class="sourceLineNo">429</span> TableSplit t = new TableSplit(tableName, scan, splitStartKey, splitEndKey,<a name="line.429"></a>
<span class="sourceLineNo">430</span> regionLocation, totalSize);<a name="line.430"></a>
<span class="sourceLineNo">431</span> resultList.add(t);<a name="line.431"></a>
<span class="sourceLineNo">432</span> }<a name="line.432"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bb348c6/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
index 4bcfbd0..a5703ad 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.html
@@ -569,7 +569,7 @@
<span class="sourceLineNo">561</span> * @return The scan saved in a Base64 encoded string.<a name="line.561"></a>
<span class="sourceLineNo">562</span> * @throws IOException When writing the scan fails.<a name="line.562"></a>
<span class="sourceLineNo">563</span> */<a name="line.563"></a>
-<span class="sourceLineNo">564</span> static String convertScanToString(Scan scan) throws IOException {<a name="line.564"></a>
+<span class="sourceLineNo">564</span> public static String convertScanToString(Scan scan) throws IOException {<a name="line.564"></a>
<span class="sourceLineNo">565</span> ClientProtos.Scan proto = ProtobufUtil.toScan(scan);<a name="line.565"></a>
<span class="sourceLineNo">566</span> return Base64.encodeBytes(proto.toByteArray());<a name="line.566"></a>
<span class="sourceLineNo">567</span> }<a name="line.567"></a>
@@ -581,7 +581,7 @@
<span class="sourceLineNo">573</span> * @return The newly created Scan instance.<a name="line.573"></a>
<span class="sourceLineNo">574</span> * @throws IOException When reading the scan instance fails.<a name="line.574"></a>
<span class="sourceLineNo">575</span> */<a name="line.575"></a>
-<span class="sourceLineNo">576</span> static Scan convertStringToScan(String base64) throws IOException {<a name="line.576"></a>
+<span class="sourceLineNo">576</span> public static Scan convertStringToScan(String base64) throws IOException {<a name="line.576"></a>
<span class="sourceLineNo">577</span> byte [] decoded = Base64.decode(base64);<a name="line.577"></a>
<span class="sourceLineNo">578</span> ClientProtos.Scan scan;<a name="line.578"></a>
<span class="sourceLineNo">579</span> try {<a name="line.579"></a>