Repository: hbase-site
Updated Branches:
  refs/heads/asf-site d9ddf1f80 -> b64ea03f9


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b64ea03f/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.DelayedRegionServer.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.DelayedRegionServer.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.DelayedRegionServer.html
index e34e623..cd72a92 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.DelayedRegionServer.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.DelayedRegionServer.html
@@ -92,116 +92,117 @@
 <span class="sourceLineNo">084</span>  @BeforeClass<a name="line.84"></a>
 <span class="sourceLineNo">085</span>  public static void setUpClass() throws 
Exception {<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
 500);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    TESTING_UTIL.startMiniCluster(1, 1, 
null, null, DelayedRegionServer.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  @Before<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public void setUp() throws Exception 
{<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    DELAY_GET = 0;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    DELAY_SCAN = 0;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    DELAY_MUTATE = 0;<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>    table = 
TESTING_UTIL.createTable(TableName.valueOf(name.getMethodName()), FAMILY);<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    Put put = new Put(ROW);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    table.put(put);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @AfterClass<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public static void tearDown() throws 
Exception {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    TESTING_UTIL.shutdownMiniCluster();<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * Tests that a get on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public void testGetTimeout() throws 
Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    DELAY_GET = 600;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    table.get(new Get(ROW));<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * Tests that a put on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public void testPutTimeout() throws 
Exception {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    DELAY_MUTATE = 600;<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    Put put = new Put(ROW);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    table.put(put);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * Tests that scan on a table throws 
{@link RetriesExhaustedException} when the operation takes<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>   * longer than 
'hbase.client.scanner.timeout.period'.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Test(expected = 
RetriesExhaustedException.class)<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public void testScanTimeout() throws 
Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    DELAY_SCAN = 600;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    ResultScanner scanner = 
table.getScanner(new Scan());<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    scanner.next();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static class 
DelayedRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    public 
DelayedRegionServer(Configuration conf) throws IOException, 
InterruptedException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      super(conf);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    protected RSRpcServices 
createRpcServices() throws IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return new 
DelayedRSRpcServices(this);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   * This {@link RSRpcServices} class 
injects delay for Rpc calls and after executes super methods.<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  public static class 
DelayedRSRpcServices extends RSRpcServices {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    DelayedRSRpcServices(HRegionServer 
rs) throws IOException {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      super(rs);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>    @Override<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    public ClientProtos.GetResponse 
get(RpcController controller, ClientProtos.GetRequest request)<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        throws ServiceException {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      try {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        Thread.sleep(DELAY_GET);<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      } catch (InterruptedException e) 
{<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        LOG.error("Sleep interrupted 
during get operation", e);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return super.get(controller, 
request);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>    @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    public ClientProtos.MutateResponse 
mutate(RpcController rpcc,<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        ClientProtos.MutateRequest 
request) throws ServiceException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        Thread.sleep(DELAY_MUTATE);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>      } catch (InterruptedException e) 
{<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        LOG.error("Sleep interrupted 
during mutate operation", e);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      return super.mutate(rpcc, 
request);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public ClientProtos.ScanResponse 
scan(RpcController controller,<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        ClientProtos.ScanRequest request) 
throws ServiceException {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      try {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        Thread.sleep(DELAY_SCAN);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      } catch (InterruptedException e) 
{<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        LOG.error("Sleep interrupted 
during scan operation", e);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return super.scan(controller, 
request);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>}<a name="line.196"></a>
+<span class="sourceLineNo">087</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
 500);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>    TESTING_UTIL.startMiniCluster(1, 1, 
null, null, DelayedRegionServer.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Before<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public void setUp() throws Exception 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    DELAY_GET = 0;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    DELAY_SCAN = 0;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    DELAY_MUTATE = 0;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    table = 
TESTING_UTIL.createTable(TableName.valueOf(name.getMethodName()), FAMILY);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    Put put = new Put(ROW);<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    table.put(put);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  public static void tearDown() throws 
Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    TESTING_UTIL.shutdownMiniCluster();<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * Tests that a get on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public void testGetTimeout() throws 
Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    DELAY_GET = 600;<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    table.get(new Get(ROW));<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * Tests that a put on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  public void testPutTimeout() throws 
Exception {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    DELAY_MUTATE = 600;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>    Put put = new Put(ROW);<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    table.put(put);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * Tests that scan on a table throws 
{@link RetriesExhaustedException} when the operation takes<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   * longer than 
'hbase.client.scanner.timeout.period'.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  @Test(expected = 
RetriesExhaustedException.class)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public void testScanTimeout() throws 
Exception {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    DELAY_SCAN = 600;<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    ResultScanner scanner = 
table.getScanner(new Scan());<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    scanner.next();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static class 
DelayedRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    public 
DelayedRegionServer(Configuration conf) throws IOException, 
InterruptedException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      super(conf);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    protected RSRpcServices 
createRpcServices() throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      return new 
DelayedRSRpcServices(this);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<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>   * This {@link RSRpcServices} class 
injects delay for Rpc calls and after executes super methods.<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>   */<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  public static class 
DelayedRSRpcServices extends RSRpcServices {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    DelayedRSRpcServices(HRegionServer 
rs) throws IOException {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      super(rs);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    public ClientProtos.GetResponse 
get(RpcController controller, ClientProtos.GetRequest request)<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>        throws ServiceException {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      try {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        Thread.sleep(DELAY_GET);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      } catch (InterruptedException e) 
{<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        LOG.error("Sleep interrupted 
during get operation", e);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      return super.get(controller, 
request);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public ClientProtos.MutateResponse 
mutate(RpcController rpcc,<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        ClientProtos.MutateRequest 
request) throws ServiceException {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      try {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        Thread.sleep(DELAY_MUTATE);<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      } catch (InterruptedException e) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        LOG.error("Sleep interrupted 
during mutate operation", e);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return super.mutate(rpcc, 
request);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public ClientProtos.ScanResponse 
scan(RpcController controller,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        ClientProtos.ScanRequest request) 
throws ServiceException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      try {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        Thread.sleep(DELAY_SCAN);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      } catch (InterruptedException e) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        LOG.error("Sleep interrupted 
during scan operation", e);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      return super.scan(controller, 
request);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>}<a name="line.197"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b64ea03f/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.html
index e34e623..cd72a92 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/TestClientOperationTimeout.html
@@ -92,116 +92,117 @@
 <span class="sourceLineNo">084</span>  @BeforeClass<a name="line.84"></a>
 <span class="sourceLineNo">085</span>  public static void setUpClass() throws 
Exception {<a name="line.85"></a>
 <span class="sourceLineNo">086</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT,
 500);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    TESTING_UTIL.startMiniCluster(1, 1, 
null, null, DelayedRegionServer.class);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  @Before<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public void setUp() throws Exception 
{<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    DELAY_GET = 0;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    DELAY_SCAN = 0;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    DELAY_MUTATE = 0;<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>    table = 
TESTING_UTIL.createTable(TableName.valueOf(name.getMethodName()), FAMILY);<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    Put put = new Put(ROW);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    table.put(put);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @AfterClass<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public static void tearDown() throws 
Exception {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    TESTING_UTIL.shutdownMiniCluster();<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * Tests that a get on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.111"></a>
-<span class="sourceLineNo">112</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.112"></a>
-<span class="sourceLineNo">113</span>   */<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public void testGetTimeout() throws 
Exception {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    DELAY_GET = 600;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    table.get(new Get(ROW));<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  /**<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   * Tests that a put on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   */<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  public void testPutTimeout() throws 
Exception {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    DELAY_MUTATE = 600;<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    Put put = new Put(ROW);<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    table.put(put);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>  /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * Tests that scan on a table throws 
{@link RetriesExhaustedException} when the operation takes<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>   * longer than 
'hbase.client.scanner.timeout.period'.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  @Test(expected = 
RetriesExhaustedException.class)<a name="line.137"></a>
-<span class="sourceLineNo">138</span>  public void testScanTimeout() throws 
Exception {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    DELAY_SCAN = 600;<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    ResultScanner scanner = 
table.getScanner(new Scan());<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    scanner.next();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  private static class 
DelayedRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    public 
DelayedRegionServer(Configuration conf) throws IOException, 
InterruptedException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      super(conf);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>    @Override<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    protected RSRpcServices 
createRpcServices() throws IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      return new 
DelayedRSRpcServices(this);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
-<span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>  /**<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   * This {@link RSRpcServices} class 
injects delay for Rpc calls and after executes super methods.<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>   */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>  public static class 
DelayedRSRpcServices extends RSRpcServices {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    DelayedRSRpcServices(HRegionServer 
rs) throws IOException {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      super(rs);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span>    @Override<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    public ClientProtos.GetResponse 
get(RpcController controller, ClientProtos.GetRequest request)<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        throws ServiceException {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      try {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        Thread.sleep(DELAY_GET);<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      } catch (InterruptedException e) 
{<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        LOG.error("Sleep interrupted 
during get operation", e);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      return super.get(controller, 
request);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>    @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    public ClientProtos.MutateResponse 
mutate(RpcController rpcc,<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        ClientProtos.MutateRequest 
request) throws ServiceException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      try {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        Thread.sleep(DELAY_MUTATE);<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>      } catch (InterruptedException e) 
{<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        LOG.error("Sleep interrupted 
during mutate operation", e);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      }<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      return super.mutate(rpcc, 
request);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    public ClientProtos.ScanResponse 
scan(RpcController controller,<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        ClientProtos.ScanRequest request) 
throws ServiceException {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      try {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        Thread.sleep(DELAY_SCAN);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      } catch (InterruptedException e) 
{<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        LOG.error("Sleep interrupted 
during scan operation", e);<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      return super.scan(controller, 
request);<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>}<a name="line.196"></a>
+<span class="sourceLineNo">087</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_META_OPERATION_TIMEOUT,
 500);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
 500);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    
TESTING_UTIL.getConfiguration().setLong(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 
1);<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>    TESTING_UTIL.startMiniCluster(1, 1, 
null, null, DelayedRegionServer.class);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Before<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public void setUp() throws Exception 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    DELAY_GET = 0;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    DELAY_SCAN = 0;<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    DELAY_MUTATE = 0;<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span>    table = 
TESTING_UTIL.createTable(TableName.valueOf(name.getMethodName()), FAMILY);<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    Put put = new Put(ROW);<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    table.put(put);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  public static void tearDown() throws 
Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    TESTING_UTIL.shutdownMiniCluster();<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * Tests that a get on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   */<a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public void testGetTimeout() throws 
Exception {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    DELAY_GET = 600;<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    table.get(new Get(ROW));<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>  }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>  /**<a name="line.121"></a>
+<span class="sourceLineNo">122</span>   * Tests that a put on a table throws 
{@link SocketTimeoutException} when the operation takes<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * longer than 
'hbase.client.operation.timeout'.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   */<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  @Test(expected = 
SocketTimeoutException.class)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  public void testPutTimeout() throws 
Exception {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    DELAY_MUTATE = 600;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>    Put put = new Put(ROW);<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    put.addColumn(FAMILY, QUALIFIER, 
VALUE);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    table.put(put);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>  /**<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * Tests that scan on a table throws 
{@link RetriesExhaustedException} when the operation takes<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   * longer than 
'hbase.client.scanner.timeout.period'.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  @Test(expected = 
RetriesExhaustedException.class)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>  public void testScanTimeout() throws 
Exception {<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    DELAY_SCAN = 600;<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    ResultScanner scanner = 
table.getScanner(new Scan());<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    scanner.next();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private static class 
DelayedRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    public 
DelayedRegionServer(Configuration conf) throws IOException, 
InterruptedException {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      super(conf);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>    @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    protected RSRpcServices 
createRpcServices() throws IOException {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      return new 
DelayedRSRpcServices(this);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<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>   * This {@link RSRpcServices} class 
injects delay for Rpc calls and after executes super methods.<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>   */<a name="line.158"></a>
+<span class="sourceLineNo">159</span>  public static class 
DelayedRSRpcServices extends RSRpcServices {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    DelayedRSRpcServices(HRegionServer 
rs) throws IOException {<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      super(rs);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    public ClientProtos.GetResponse 
get(RpcController controller, ClientProtos.GetRequest request)<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>        throws ServiceException {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      try {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        Thread.sleep(DELAY_GET);<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      } catch (InterruptedException e) 
{<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        LOG.error("Sleep interrupted 
during get operation", e);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      return super.get(controller, 
request);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public ClientProtos.MutateResponse 
mutate(RpcController rpcc,<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        ClientProtos.MutateRequest 
request) throws ServiceException {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      try {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        Thread.sleep(DELAY_MUTATE);<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      } catch (InterruptedException e) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        LOG.error("Sleep interrupted 
during mutate operation", e);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return super.mutate(rpcc, 
request);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public ClientProtos.ScanResponse 
scan(RpcController controller,<a name="line.187"></a>
+<span class="sourceLineNo">188</span>        ClientProtos.ScanRequest request) 
throws ServiceException {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      try {<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        Thread.sleep(DELAY_SCAN);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      } catch (InterruptedException e) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        LOG.error("Sleep interrupted 
during scan operation", e);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      return super.scan(controller, 
request);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>}<a name="line.197"></a>
 
 
 

Reply via email to