You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/10/09 15:12:53 UTC
[15/52] [partial] hbase-site git commit: Published site at
e06c3676f1273f033e3e185ee9c1ec52c1c7cb31.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
index abf6b1f..d649da0 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.html
@@ -48,277 +48,279 @@
<span class="sourceLineNo">040</span>import org.apache.hadoop.mapreduce.TaskAttemptContext;<a name="line.40"></a>
<span class="sourceLineNo">041</span>import org.apache.hadoop.util.StringUtils;<a name="line.41"></a>
<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * Iterate over an HBase table data, return (ImmutableBytesWritable, Result)<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * pairs.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@InterfaceAudience.Public<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@InterfaceStability.Stable<a name="line.48"></a>
-<span class="sourceLineNo">049</span>public class TableRecordReaderImpl {<a name="line.49"></a>
-<span class="sourceLineNo">050</span> public static final String LOG_PER_ROW_COUNT<a name="line.50"></a>
-<span class="sourceLineNo">051</span> = "hbase.mapreduce.log.scanner.rowcount";<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class);<a name="line.53"></a>
+<span class="sourceLineNo">043</span>import com.google.common.annotations.VisibleForTesting;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * Iterate over an HBase table data, return (ImmutableBytesWritable, Result)<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * pairs.<a name="line.47"></a>
+<span class="sourceLineNo">048</span> */<a name="line.48"></a>
+<span class="sourceLineNo">049</span>@InterfaceAudience.Public<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@InterfaceStability.Stable<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class TableRecordReaderImpl {<a name="line.51"></a>
+<span class="sourceLineNo">052</span> public static final String LOG_PER_ROW_COUNT<a name="line.52"></a>
+<span class="sourceLineNo">053</span> = "hbase.mapreduce.log.scanner.rowcount";<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> // HBASE_COUNTER_GROUP_NAME is the name of mapreduce counter group for HBase<a name="line.55"></a>
-<span class="sourceLineNo">056</span> private static final String HBASE_COUNTER_GROUP_NAME =<a name="line.56"></a>
-<span class="sourceLineNo">057</span> "HBase Counters";<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private ResultScanner scanner = null;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private Scan scan = null;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private Scan currentScan = null;<a name="line.60"></a>
-<span class="sourceLineNo">061</span> private Table htable = null;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private byte[] lastSuccessfulRow = null;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private ImmutableBytesWritable key = null;<a name="line.63"></a>
-<span class="sourceLineNo">064</span> private Result value = null;<a name="line.64"></a>
-<span class="sourceLineNo">065</span> private TaskAttemptContext context = null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private Method getCounter = null;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> private long numRestarts = 0;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> private long numStale = 0;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> private long timestamp;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> private int rowcount;<a name="line.70"></a>
-<span class="sourceLineNo">071</span> private boolean logScannerActivity = false;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> private int logPerRowCount = 100;<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> /**<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * Restart from survivable exceptions by creating a new scanner.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> *<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * @param firstRow The first row to start at.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * @throws IOException When restarting fails.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> */<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public void restart(byte[] firstRow) throws IOException {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> currentScan = new Scan(scan);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> currentScan.setStartRow(firstRow);<a name="line.82"></a>
-<span class="sourceLineNo">083</span> currentScan.setScanMetricsEnabled(true);<a name="line.83"></a>
-<span class="sourceLineNo">084</span> if (this.scanner != null) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> if (logScannerActivity) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> LOG.info("Closing the previously opened scanner object.");<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> this.scanner.close();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span> this.scanner = this.htable.getScanner(currentScan);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> if (logScannerActivity) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> LOG.info("Current scan=" + currentScan.toString());<a name="line.92"></a>
-<span class="sourceLineNo">093</span> timestamp = System.currentTimeMillis();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> rowcount = 0;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span> * In new mapreduce APIs, TaskAttemptContext has two getCounter methods<a name="line.99"></a>
-<span class="sourceLineNo">100</span> * Check if getCounter(String, String) method is available.<a name="line.100"></a>
-<span class="sourceLineNo">101</span> * @return The getCounter method or null if not available.<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * @throws IOException<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> protected static Method retrieveGetCounterWithStringsParams(TaskAttemptContext context)<a name="line.104"></a>
-<span class="sourceLineNo">105</span> throws IOException {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> Method m = null;<a name="line.106"></a>
-<span class="sourceLineNo">107</span> try {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> m = context.getClass().getMethod("getCounter",<a name="line.108"></a>
-<span class="sourceLineNo">109</span> new Class [] {String.class, String.class});<a name="line.109"></a>
-<span class="sourceLineNo">110</span> } catch (SecurityException e) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> throw new IOException("Failed test for getCounter", e);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> } catch (NoSuchMethodException e) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> // Ignore<a name="line.113"></a>
-<span class="sourceLineNo">114</span> }<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return m;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Sets the HBase table.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> *<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param htable The {@link org.apache.hadoop.hbase.HTableDescriptor} to scan.<a name="line.121"></a>
-<span class="sourceLineNo">122</span> */<a name="line.122"></a>
-<span class="sourceLineNo">123</span> public void setHTable(Table htable) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> Configuration conf = htable.getConfiguration();<a name="line.124"></a>
-<span class="sourceLineNo">125</span> logScannerActivity = conf.getBoolean(<a name="line.125"></a>
-<span class="sourceLineNo">126</span> ScannerCallable.LOG_SCANNER_ACTIVITY, false);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> logPerRowCount = conf.getInt(LOG_PER_ROW_COUNT, 100);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> this.htable = htable;<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * Sets the scan defining the actual details like columns etc.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> *<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param scan The scan to set.<a name="line.134"></a>
-<span class="sourceLineNo">135</span> */<a name="line.135"></a>
-<span class="sourceLineNo">136</span> public void setScan(Scan scan) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> this.scan = scan;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Build the scanner. Not done in constructor to allow for extension.<a name="line.141"></a>
-<span class="sourceLineNo">142</span> *<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * @throws IOException<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @throws InterruptedException<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public void initialize(InputSplit inputsplit,<a name="line.146"></a>
-<span class="sourceLineNo">147</span> TaskAttemptContext context) throws IOException,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> InterruptedException {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> if (context != null) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> this.context = context;<a name="line.150"></a>
-<span class="sourceLineNo">151</span> getCounter = retrieveGetCounterWithStringsParams(context);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span> restart(scan.getStartRow());<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> * Closes the split.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> *<a name="line.158"></a>
-<span class="sourceLineNo">159</span> *<a name="line.159"></a>
-<span class="sourceLineNo">160</span> */<a name="line.160"></a>
-<span class="sourceLineNo">161</span> public void close() {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> this.scanner.close();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> try {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> this.htable.close();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> } catch (IOException ioe) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> LOG.warn("Error closing table", ioe);<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<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> * Returns the current key.<a name="line.171"></a>
-<span class="sourceLineNo">172</span> *<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * @return The current key.<a name="line.173"></a>
-<span class="sourceLineNo">174</span> * @throws IOException<a name="line.174"></a>
-<span class="sourceLineNo">175</span> * @throws InterruptedException When the job is aborted.<a name="line.175"></a>
-<span class="sourceLineNo">176</span> */<a name="line.176"></a>
-<span class="sourceLineNo">177</span> public ImmutableBytesWritable getCurrentKey() throws IOException,<a name="line.177"></a>
-<span class="sourceLineNo">178</span> InterruptedException {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return key;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span> * Returns the current value.<a name="line.183"></a>
-<span class="sourceLineNo">184</span> *<a name="line.184"></a>
-<span class="sourceLineNo">185</span> * @return The current value.<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * @throws IOException When the value is faulty.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * @throws InterruptedException When the job is aborted.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> */<a name="line.188"></a>
-<span class="sourceLineNo">189</span> public Result getCurrentValue() throws IOException, InterruptedException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return value;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<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> * Positions the record reader to the next record.<a name="line.195"></a>
-<span class="sourceLineNo">196</span> *<a name="line.196"></a>
-<span class="sourceLineNo">197</span> * @return <code>true</code> if there was another record.<a name="line.197"></a>
-<span class="sourceLineNo">198</span> * @throws IOException When reading the record failed.<a name="line.198"></a>
-<span class="sourceLineNo">199</span> * @throws InterruptedException When the job was aborted.<a name="line.199"></a>
-<span class="sourceLineNo">200</span> */<a name="line.200"></a>
-<span class="sourceLineNo">201</span> public boolean nextKeyValue() throws IOException, InterruptedException {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> if (key == null) key = new ImmutableBytesWritable();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (value == null) value = new Result();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> try {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> try {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> value = this.scanner.next();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> if (value != null && value.isStale()) numStale++;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> if (logScannerActivity) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> rowcount ++;<a name="line.209"></a>
-<span class="sourceLineNo">210</span> if (rowcount >= logPerRowCount) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> long now = System.currentTimeMillis();<a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.info("Mapper took " + (now-timestamp)<a name="line.212"></a>
-<span class="sourceLineNo">213</span> + "ms to process " + rowcount + " rows");<a name="line.213"></a>
-<span class="sourceLineNo">214</span> timestamp = now;<a name="line.214"></a>
-<span class="sourceLineNo">215</span> rowcount = 0;<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span> } catch (IOException e) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> // do not retry if the exception tells us not to do so<a name="line.219"></a>
-<span class="sourceLineNo">220</span> if (e instanceof DoNotRetryIOException) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> throw e;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span> // try to handle all other IOExceptions by restarting<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // the scanner, if the second call fails, it will be rethrown<a name="line.224"></a>
-<span class="sourceLineNo">225</span> LOG.info("recovered from " + StringUtils.stringifyException(e));<a name="line.225"></a>
-<span class="sourceLineNo">226</span> if (lastSuccessfulRow == null) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> LOG.warn("We are restarting the first next() invocation," +<a name="line.227"></a>
-<span class="sourceLineNo">228</span> " if your mapper has restarted a few other times like this" +<a name="line.228"></a>
-<span class="sourceLineNo">229</span> " then you should consider killing this job and investigate" +<a name="line.229"></a>
-<span class="sourceLineNo">230</span> " why it's taking so long.");<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (lastSuccessfulRow == null) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> restart(scan.getStartRow());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> } else {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> restart(lastSuccessfulRow);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> scanner.next(); // skip presumed already mapped row<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> value = scanner.next();<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (value != null && value.isStale()) numStale++;<a name="line.239"></a>
-<span class="sourceLineNo">240</span> numRestarts++;<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (value != null && value.size() > 0) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> key.set(value.getRow());<a name="line.243"></a>
-<span class="sourceLineNo">244</span> lastSuccessfulRow = key.get();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return true;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> updateCounters();<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return false;<a name="line.249"></a>
-<span class="sourceLineNo">250</span> } catch (IOException ioe) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> if (logScannerActivity) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> long now = System.currentTimeMillis();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> LOG.info("Mapper took " + (now-timestamp)<a name="line.253"></a>
-<span class="sourceLineNo">254</span> + "ms to process " + rowcount + " rows");<a name="line.254"></a>
-<span class="sourceLineNo">255</span> LOG.info(ioe);<a name="line.255"></a>
-<span class="sourceLineNo">256</span> String lastRow = lastSuccessfulRow == null ?<a name="line.256"></a>
-<span class="sourceLineNo">257</span> "null" : Bytes.toStringBinary(lastSuccessfulRow);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> LOG.info("lastSuccessfulRow=" + lastRow);<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> throw ioe;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<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> * If hbase runs on new version of mapreduce, RecordReader has access to<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * counters thus can update counters based on scanMetrics.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * If hbase runs on old version of mapreduce, it won't be able to get<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * access to counters and TableRecorderReader can't update counter values.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @throws IOException<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> private void updateCounters() throws IOException {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> ScanMetrics scanMetrics = this.scan.getScanMetrics();<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (scanMetrics == null) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> return;<a name="line.274"></a>
-<span class="sourceLineNo">275</span> }<a name="line.275"></a>
-<span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span> updateCounters(scanMetrics, numRestarts, getCounter, context, numStale);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span> protected static void updateCounters(ScanMetrics scanMetrics, long numScannerRestarts,<a name="line.280"></a>
-<span class="sourceLineNo">281</span> Method getCounter, TaskAttemptContext context, long numStale) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // we can get access to counters only if hbase uses new mapreduce APIs<a name="line.282"></a>
-<span class="sourceLineNo">283</span> if (getCounter == null) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> return;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> try {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> for (Map.Entry<String, Long> entry:scanMetrics.getMetricsMap().entrySet()) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> Counter ct = (Counter)getCounter.invoke(context,<a name="line.289"></a>
-<span class="sourceLineNo">290</span> HBASE_COUNTER_GROUP_NAME, entry.getKey());<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> ct.increment(entry.getValue());<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span> ((Counter) getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.294"></a>
-<span class="sourceLineNo">295</span> "NUM_SCANNER_RESTARTS")).increment(numScannerRestarts);<a name="line.295"></a>
+<span class="sourceLineNo">055</span> private static final Log LOG = LogFactory.getLog(TableRecordReaderImpl.class);<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> // HBASE_COUNTER_GROUP_NAME is the name of mapreduce counter group for HBase<a name="line.57"></a>
+<span class="sourceLineNo">058</span> @VisibleForTesting<a name="line.58"></a>
+<span class="sourceLineNo">059</span> static final String HBASE_COUNTER_GROUP_NAME = "HBase Counters";<a name="line.59"></a>
+<span class="sourceLineNo">060</span> private ResultScanner scanner = null;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private Scan scan = null;<a name="line.61"></a>
+<span class="sourceLineNo">062</span> private Scan currentScan = null;<a name="line.62"></a>
+<span class="sourceLineNo">063</span> private Table htable = null;<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private byte[] lastSuccessfulRow = null;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> private ImmutableBytesWritable key = null;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> private Result value = null;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private TaskAttemptContext context = null;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> private Method getCounter = null;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> private long numRestarts = 0;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private long numStale = 0;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> private long timestamp;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> private int rowcount;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private boolean logScannerActivity = false;<a name="line.73"></a>
+<span class="sourceLineNo">074</span> private int logPerRowCount = 100;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> /**<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * Restart from survivable exceptions by creating a new scanner.<a name="line.77"></a>
+<span class="sourceLineNo">078</span> *<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * @param firstRow The first row to start at.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * @throws IOException When restarting fails.<a name="line.80"></a>
+<span class="sourceLineNo">081</span> */<a name="line.81"></a>
+<span class="sourceLineNo">082</span> public void restart(byte[] firstRow) throws IOException {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> currentScan = new Scan(scan);<a name="line.83"></a>
+<span class="sourceLineNo">084</span> currentScan.setStartRow(firstRow);<a name="line.84"></a>
+<span class="sourceLineNo">085</span> currentScan.setScanMetricsEnabled(true);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> if (this.scanner != null) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> if (logScannerActivity) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> LOG.info("Closing the previously opened scanner object.");<a name="line.88"></a>
+<span class="sourceLineNo">089</span> }<a name="line.89"></a>
+<span class="sourceLineNo">090</span> this.scanner.close();<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> this.scanner = this.htable.getScanner(currentScan);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (logScannerActivity) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> LOG.info("Current scan=" + currentScan.toString());<a name="line.94"></a>
+<span class="sourceLineNo">095</span> timestamp = System.currentTimeMillis();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> rowcount = 0;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * In new mapreduce APIs, TaskAttemptContext has two getCounter methods<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * Check if getCounter(String, String) method is available.<a name="line.102"></a>
+<span class="sourceLineNo">103</span> * @return The getCounter method or null if not available.<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * @throws IOException<a name="line.104"></a>
+<span class="sourceLineNo">105</span> */<a name="line.105"></a>
+<span class="sourceLineNo">106</span> protected static Method retrieveGetCounterWithStringsParams(TaskAttemptContext context)<a name="line.106"></a>
+<span class="sourceLineNo">107</span> throws IOException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> Method m = null;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> try {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> m = context.getClass().getMethod("getCounter",<a name="line.110"></a>
+<span class="sourceLineNo">111</span> new Class [] {String.class, String.class});<a name="line.111"></a>
+<span class="sourceLineNo">112</span> } catch (SecurityException e) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> throw new IOException("Failed test for getCounter", e);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> } catch (NoSuchMethodException e) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> // Ignore<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return m;<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> * Sets the HBase table.<a name="line.121"></a>
+<span class="sourceLineNo">122</span> *<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param htable The {@link org.apache.hadoop.hbase.HTableDescriptor} to scan.<a name="line.123"></a>
+<span class="sourceLineNo">124</span> */<a name="line.124"></a>
+<span class="sourceLineNo">125</span> public void setHTable(Table htable) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Configuration conf = htable.getConfiguration();<a name="line.126"></a>
+<span class="sourceLineNo">127</span> logScannerActivity = conf.getBoolean(<a name="line.127"></a>
+<span class="sourceLineNo">128</span> ScannerCallable.LOG_SCANNER_ACTIVITY, false);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> logPerRowCount = conf.getInt(LOG_PER_ROW_COUNT, 100);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> this.htable = htable;<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> * Sets the scan defining the actual details like columns etc.<a name="line.134"></a>
+<span class="sourceLineNo">135</span> *<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * @param scan The scan to set.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> */<a name="line.137"></a>
+<span class="sourceLineNo">138</span> public void setScan(Scan scan) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> this.scan = scan;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
+<span class="sourceLineNo">143</span> * Build the scanner. Not done in constructor to allow for extension.<a name="line.143"></a>
+<span class="sourceLineNo">144</span> *<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * @throws IOException<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @throws InterruptedException<a name="line.146"></a>
+<span class="sourceLineNo">147</span> */<a name="line.147"></a>
+<span class="sourceLineNo">148</span> public void initialize(InputSplit inputsplit,<a name="line.148"></a>
+<span class="sourceLineNo">149</span> TaskAttemptContext context) throws IOException,<a name="line.149"></a>
+<span class="sourceLineNo">150</span> InterruptedException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (context != null) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> this.context = context;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> getCounter = retrieveGetCounterWithStringsParams(context);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> restart(scan.getStartRow());<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> /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * Closes the split.<a name="line.159"></a>
+<span class="sourceLineNo">160</span> *<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> public void close() {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> this.scanner.close();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> try {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> this.htable.close();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> } catch (IOException ioe) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> LOG.warn("Error closing table", ioe);<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> * Returns the current key.<a name="line.173"></a>
+<span class="sourceLineNo">174</span> *<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * @return The current key.<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * @throws IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> * @throws InterruptedException When the job is aborted.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> */<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public ImmutableBytesWritable getCurrentKey() throws IOException,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> InterruptedException {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return key;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<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> * Returns the current value.<a name="line.185"></a>
+<span class="sourceLineNo">186</span> *<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * @return The current value.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * @throws IOException When the value is faulty.<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * @throws InterruptedException When the job is aborted.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> */<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public Result getCurrentValue() throws IOException, InterruptedException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return value;<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><a name="line.195"></a>
+<span class="sourceLineNo">196</span> /**<a name="line.196"></a>
+<span class="sourceLineNo">197</span> * Positions the record reader to the next record.<a name="line.197"></a>
+<span class="sourceLineNo">198</span> *<a name="line.198"></a>
+<span class="sourceLineNo">199</span> * @return <code>true</code> if there was another record.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * @throws IOException When reading the record failed.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * @throws InterruptedException When the job was aborted.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> */<a name="line.202"></a>
+<span class="sourceLineNo">203</span> public boolean nextKeyValue() throws IOException, InterruptedException {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> if (key == null) key = new ImmutableBytesWritable();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> if (value == null) value = new Result();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> try {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> try {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> value = this.scanner.next();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (value != null && value.isStale()) numStale++;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (logScannerActivity) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> rowcount ++;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> if (rowcount >= logPerRowCount) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> long now = System.currentTimeMillis();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> LOG.info("Mapper took " + (now-timestamp)<a name="line.214"></a>
+<span class="sourceLineNo">215</span> + "ms to process " + rowcount + " rows");<a name="line.215"></a>
+<span class="sourceLineNo">216</span> timestamp = now;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> rowcount = 0;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> } catch (IOException e) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // do not retry if the exception tells us not to do so<a name="line.221"></a>
+<span class="sourceLineNo">222</span> if (e instanceof DoNotRetryIOException) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> throw e;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // try to handle all other IOExceptions by restarting<a name="line.225"></a>
+<span class="sourceLineNo">226</span> // the scanner, if the second call fails, it will be rethrown<a name="line.226"></a>
+<span class="sourceLineNo">227</span> LOG.info("recovered from " + StringUtils.stringifyException(e));<a name="line.227"></a>
+<span class="sourceLineNo">228</span> if (lastSuccessfulRow == null) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> LOG.warn("We are restarting the first next() invocation," +<a name="line.229"></a>
+<span class="sourceLineNo">230</span> " if your mapper has restarted a few other times like this" +<a name="line.230"></a>
+<span class="sourceLineNo">231</span> " then you should consider killing this job and investigate" +<a name="line.231"></a>
+<span class="sourceLineNo">232</span> " why it's taking so long.");<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (lastSuccessfulRow == null) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> restart(scan.getStartRow());<a name="line.235"></a>
+<span class="sourceLineNo">236</span> } else {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> restart(lastSuccessfulRow);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> scanner.next(); // skip presumed already mapped row<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span> value = scanner.next();<a name="line.240"></a>
+<span class="sourceLineNo">241</span> if (value != null && value.isStale()) numStale++;<a name="line.241"></a>
+<span class="sourceLineNo">242</span> numRestarts++;<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (value != null && value.size() > 0) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> key.set(value.getRow());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> lastSuccessfulRow = key.get();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return true;<a name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> updateCounters();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> return false;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> } catch (IOException ioe) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (logScannerActivity) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> long now = System.currentTimeMillis();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> LOG.info("Mapper took " + (now-timestamp)<a name="line.255"></a>
+<span class="sourceLineNo">256</span> + "ms to process " + rowcount + " rows");<a name="line.256"></a>
+<span class="sourceLineNo">257</span> LOG.info(ioe);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> String lastRow = lastSuccessfulRow == null ?<a name="line.258"></a>
+<span class="sourceLineNo">259</span> "null" : Bytes.toStringBinary(lastSuccessfulRow);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> LOG.info("lastSuccessfulRow=" + lastRow);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span> throw ioe;<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><a name="line.265"></a>
+<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * If hbase runs on new version of mapreduce, RecordReader has access to<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * counters thus can update counters based on scanMetrics.<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * If hbase runs on old version of mapreduce, it won't be able to get<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * access to counters and TableRecorderReader can't update counter values.<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * @throws IOException<a name="line.271"></a>
+<span class="sourceLineNo">272</span> */<a name="line.272"></a>
+<span class="sourceLineNo">273</span> private void updateCounters() throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> ScanMetrics scanMetrics = currentScan.getScanMetrics();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (scanMetrics == null) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> updateCounters(scanMetrics, numRestarts, getCounter, context, numStale);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> protected static void updateCounters(ScanMetrics scanMetrics, long numScannerRestarts,<a name="line.282"></a>
+<span class="sourceLineNo">283</span> Method getCounter, TaskAttemptContext context, long numStale) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> // we can get access to counters only if hbase uses new mapreduce APIs<a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (getCounter == null) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> return;<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> try {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> for (Map.Entry<String, Long> entry:scanMetrics.getMetricsMap().entrySet()) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Counter ct = (Counter)getCounter.invoke(context,<a name="line.291"></a>
+<span class="sourceLineNo">292</span> HBASE_COUNTER_GROUP_NAME, entry.getKey());<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> ct.increment(entry.getValue());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
<span class="sourceLineNo">296</span> ((Counter) getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.296"></a>
-<span class="sourceLineNo">297</span> "NUM_SCAN_RESULTS_STALE")).increment(numStale);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> } catch (Exception e) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> LOG.debug("can't update counter." + StringUtils.stringifyException(e));<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><a name="line.302"></a>
-<span class="sourceLineNo">303</span> /**<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * The current progress of the record reader through its data.<a name="line.304"></a>
-<span class="sourceLineNo">305</span> *<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * @return A number between 0.0 and 1.0, the fraction of the data read.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> */<a name="line.307"></a>
-<span class="sourceLineNo">308</span> public float getProgress() {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> // Depends on the total number of tuples<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return 0;<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span>}<a name="line.313"></a>
+<span class="sourceLineNo">297</span> "NUM_SCANNER_RESTARTS")).increment(numScannerRestarts);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> ((Counter) getCounter.invoke(context, HBASE_COUNTER_GROUP_NAME,<a name="line.298"></a>
+<span class="sourceLineNo">299</span> "NUM_SCAN_RESULTS_STALE")).increment(numStale);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> } catch (Exception e) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> LOG.debug("can't update counter." + StringUtils.stringifyException(e));<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * The current progress of the record reader through its data.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> *<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * @return A number between 0.0 and 1.0, the fraction of the data read.<a name="line.308"></a>
+<span class="sourceLineNo">309</span> */<a name="line.309"></a>
+<span class="sourceLineNo">310</span> public float getProgress() {<a name="line.310"></a>
+<span class="sourceLineNo">311</span> // Depends on the total number of tuples<a name="line.311"></a>
+<span class="sourceLineNo">312</span> return 0;<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>}<a name="line.315"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html
index 34bbb95..ae5a650 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaRetriever.html
@@ -44,7 +44,7 @@
<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.36"></a>
<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.Table;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas;<a name="line.39"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.39"></a>
<span class="sourceLineNo">040</span>import org.apache.hadoop.util.StringUtils;<a name="line.40"></a>
<span class="sourceLineNo">041</span><a name="line.41"></a>
<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html
index 0f937df..6e29df5 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettings.html
@@ -30,8 +30,8 @@
<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.TableName;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.26"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.26"></a>
<span class="sourceLineNo">027</span><a name="line.27"></a>
<span class="sourceLineNo">028</span>@InterfaceAudience.Public<a name="line.28"></a>
<span class="sourceLineNo">029</span>@InterfaceStability.Evolving<a name="line.29"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
index 4442868..66a6f10 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/quotas/QuotaSettingsFactory.html
@@ -32,10 +32,10 @@
<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.TableName;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos.Quotas;<a name="line.30"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
<span class="sourceLineNo">032</span>@InterfaceAudience.Public<a name="line.32"></a>
<span class="sourceLineNo">033</span>@InterfaceStability.Evolving<a name="line.33"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html
index d009a5c..add6a1e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeerConfig.html
@@ -36,94 +36,93 @@
<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>/**<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * A configuration for the replication peer cluster.<a name="line.35"></a>
-<span class="sourceLineNo">036</span> */<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceAudience.Public<a name="line.37"></a>
-<span class="sourceLineNo">038</span>@InterfaceStability.Evolving<a name="line.38"></a>
-<span class="sourceLineNo">039</span>public class ReplicationPeerConfig {<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> private String clusterKey;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> private String replicationEndpointImpl;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> private final Map<byte[], byte[]> peerData;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> private final Map<String, String> configuration;<a name="line.44"></a>
-<span class="sourceLineNo">045</span> private Map<TableName, ? extends Collection<String>> tableCFsMap = null;<a name="line.45"></a>
-<span class="sourceLineNo">046</span> private Set<String> namespaces = null;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span> public ReplicationPeerConfig() {<a name="line.48"></a>
-<span class="sourceLineNo">049</span> this.peerData = new TreeMap<byte[], byte[]>(Bytes.BYTES_COMPARATOR);<a name="line.49"></a>
-<span class="sourceLineNo">050</span> this.configuration = new HashMap<String, String>(0);<a name="line.50"></a>
-<span class="sourceLineNo">051</span> }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span> /**<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * Set the clusterKey which is the concatenation of the slave cluster's:<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * hbase.zookeeper.quorum:hbase.zookeeper.property.clientPort:zookeeper.znode.parent<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span> public ReplicationPeerConfig setClusterKey(String clusterKey) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> this.clusterKey = clusterKey;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> return this;<a name="line.59"></a>
-<span class="sourceLineNo">060</span> }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * Sets the ReplicationEndpoint plugin class for this peer.<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * @param replicationEndpointImpl a class implementing ReplicationEndpoint<a name="line.64"></a>
-<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span> public ReplicationPeerConfig setReplicationEndpointImpl(String replicationEndpointImpl) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> this.replicationEndpointImpl = replicationEndpointImpl;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return this;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> public String getClusterKey() {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return clusterKey;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> public String getReplicationEndpointImpl() {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> return replicationEndpointImpl;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> public Map<byte[], byte[]> getPeerData() {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> return peerData;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> public Map<String, String> getConfiguration() {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return configuration;<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> public Map<TableName, List<String>> getTableCFsMap() {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> return (Map<TableName, List<String>>) tableCFsMap;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> public ReplicationPeerConfig setTableCFsMap(Map<TableName,<a name="line.91"></a>
-<span class="sourceLineNo">092</span> ? extends Collection<String>> tableCFsMap) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> this.tableCFsMap = tableCFsMap;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return this;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> public Set<String> getNamespaces() {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> return this.namespaces;<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> public ReplicationPeerConfig setNamespaces(Set<String> namespaces) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> this.namespaces = namespaces;<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return this;<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> @Override<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public String toString() {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> StringBuilder builder = new StringBuilder("clusterKey=").append(clusterKey).append(",");<a name="line.108"></a>
-<span class="sourceLineNo">109</span> builder.append("replicationEndpointImpl=").append(replicationEndpointImpl).append(",");<a name="line.109"></a>
-<span class="sourceLineNo">110</span> if (namespaces != null) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> builder.append("namespaces=").append(namespaces.toString()).append(",");<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (tableCFsMap != null) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> builder.append("tableCFs=").append(tableCFsMap.toString());<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return builder.toString();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span>}<a name="line.118"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * A configuration for the replication peer cluster.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> */<a name="line.35"></a>
+<span class="sourceLineNo">036</span>@InterfaceAudience.Public<a name="line.36"></a>
+<span class="sourceLineNo">037</span>@InterfaceStability.Evolving<a name="line.37"></a>
+<span class="sourceLineNo">038</span>public class ReplicationPeerConfig {<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> private String clusterKey;<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private String replicationEndpointImpl;<a name="line.41"></a>
+<span class="sourceLineNo">042</span> private final Map<byte[], byte[]> peerData;<a name="line.42"></a>
+<span class="sourceLineNo">043</span> private final Map<String, String> configuration;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> private Map<TableName, ? extends Collection<String>> tableCFsMap = null;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> private Set<String> namespaces = null;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span> public ReplicationPeerConfig() {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> this.peerData = new TreeMap<byte[], byte[]>(Bytes.BYTES_COMPARATOR);<a name="line.48"></a>
+<span class="sourceLineNo">049</span> this.configuration = new HashMap<String, String>(0);<a name="line.49"></a>
+<span class="sourceLineNo">050</span> }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * Set the clusterKey which is the concatenation of the slave cluster's:<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * hbase.zookeeper.quorum:hbase.zookeeper.property.clientPort:zookeeper.znode.parent<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span> public ReplicationPeerConfig setClusterKey(String clusterKey) {<a name="line.56"></a>
+<span class="sourceLineNo">057</span> this.clusterKey = clusterKey;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> return this;<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Sets the ReplicationEndpoint plugin class for this peer.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * @param replicationEndpointImpl a class implementing ReplicationEndpoint<a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span> public ReplicationPeerConfig setReplicationEndpointImpl(String replicationEndpointImpl) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> this.replicationEndpointImpl = replicationEndpointImpl;<a name="line.66"></a>
+<span class="sourceLineNo">067</span> return this;<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> public String getClusterKey() {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return clusterKey;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> public String getReplicationEndpointImpl() {<a name="line.74"></a>
+<span class="sourceLineNo">075</span> return replicationEndpointImpl;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> public Map<byte[], byte[]> getPeerData() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return peerData;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> public Map<String, String> getConfiguration() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return configuration;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> public Map<TableName, List<String>> getTableCFsMap() {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> return (Map<TableName, List<String>>) tableCFsMap;<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> public ReplicationPeerConfig setTableCFsMap(Map<TableName,<a name="line.90"></a>
+<span class="sourceLineNo">091</span> ? extends Collection<String>> tableCFsMap) {<a name="line.91"></a>
+<span class="sourceLineNo">092</span> this.tableCFsMap = tableCFsMap;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> return this;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span> public Set<String> getNamespaces() {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return this.namespaces;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> public ReplicationPeerConfig setNamespaces(Set<String> namespaces) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> this.namespaces = namespaces;<a name="line.101"></a>
+<span class="sourceLineNo">102</span> return this;<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> @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span> public String toString() {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> StringBuilder builder = new StringBuilder("clusterKey=").append(clusterKey).append(",");<a name="line.107"></a>
+<span class="sourceLineNo">108</span> builder.append("replicationEndpointImpl=").append(replicationEndpointImpl).append(",");<a name="line.108"></a>
+<span class="sourceLineNo">109</span> if (namespaces != null) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> builder.append("namespaces=").append(namespaces.toString()).append(",");<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span> if (tableCFsMap != null) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> builder.append("tableCFs=").append(tableCFsMap.toString());<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span> return builder.toString();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>}<a name="line.117"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html b/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
index 7090914..5807821 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html
@@ -191,8 +191,7 @@
<span class="sourceLineNo">183</span> result = 31 * result + name.hashCode();<a name="line.183"></a>
<span class="sourceLineNo">184</span> return result;<a name="line.184"></a>
<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>}<a name="line.187"></a>
+<span class="sourceLineNo">186</span>}<a name="line.186"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html b/apidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
index 0a8e897..aa0d64e 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/snapshot/ExportSnapshot.html
@@ -62,9 +62,9 @@
<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.io.WALLink;<a name="line.54"></a>
<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.mapreduce.TableMapReduceUtil;<a name="line.55"></a>
<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.mob.MobUtils;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotFileInfo;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a name="line.59"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.SnapshotDescription;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotFileInfo;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a name="line.59"></a>
<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.60"></a>
<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.HFileArchiveUtil;<a name="line.61"></a>
<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.62"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c7e84622/apidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html b/apidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
index 8aba390..09f36f6 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/snapshot/SnapshotInfo.html
@@ -60,9 +60,9 @@
<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.52"></a>
<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.io.HFileLink;<a name="line.53"></a>
<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.io.WALLink;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a name="line.57"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotRegionManifest;<a name="line.57"></a>
<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.58"></a>
<span class="sourceLineNo">059</span><a name="line.59"></a>
<span class="sourceLineNo">060</span>/**<a name="line.60"></a>