You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/23 00:24:50 UTC
[27/51] [partial] hbase-site git commit: Published site at
95a13b51ee052eb73882682e8f009bfa1e914866.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/32d40534/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
index 5bcceeb..a74e672 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/WALEdit.html
@@ -107,7 +107,7 @@
<span class="sourceLineNo">099</span> private final int VERSION_2 = -1;<a name="line.99"></a>
<span class="sourceLineNo">100</span> private final boolean isReplay;<a name="line.100"></a>
<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> private final ArrayList<Cell> cells = new ArrayList<Cell>(1);<a name="line.102"></a>
+<span class="sourceLineNo">102</span> private ArrayList<Cell> cells = new ArrayList<Cell>(1);<a name="line.102"></a>
<span class="sourceLineNo">103</span><a name="line.103"></a>
<span class="sourceLineNo">104</span> public static final WALEdit EMPTY_WALEDIT = new WALEdit();<a name="line.104"></a>
<span class="sourceLineNo">105</span><a name="line.105"></a>
@@ -178,209 +178,221 @@
<span class="sourceLineNo">170</span> return cells;<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> public NavigableMap<byte[], Integer> getAndRemoveScopes() {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> NavigableMap<byte[], Integer> result = scopes;<a name="line.174"></a>
-<span class="sourceLineNo">175</span> scopes = null;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return result;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> @Override<a name="line.179"></a>
-<span class="sourceLineNo">180</span> public void readFields(DataInput in) throws IOException {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> cells.clear();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (scopes != null) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> scopes.clear();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> int versionOrLength = in.readInt();<a name="line.185"></a>
-<span class="sourceLineNo">186</span> // TODO: Change version when we protobuf. Also, change way we serialize KV! Pb it too.<a name="line.186"></a>
-<span class="sourceLineNo">187</span> if (versionOrLength == VERSION_2) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> // this is new style WAL entry containing multiple KeyValues.<a name="line.188"></a>
-<span class="sourceLineNo">189</span> int numEdits = in.readInt();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> for (int idx = 0; idx < numEdits; idx++) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> if (compressionContext != null) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> this.add(KeyValueCompression.readKV(in, compressionContext));<a name="line.192"></a>
-<span class="sourceLineNo">193</span> } else {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> this.add(KeyValueUtil.create(in));<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> int numFamilies = in.readInt();<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (numFamilies > 0) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> if (scopes == null) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR);<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> for (int i = 0; i < numFamilies; i++) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> byte[] fam = Bytes.readByteArray(in);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> int scope = in.readInt();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> scopes.put(fam, scope);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> } else {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> // this is an old style WAL entry. The int that we just<a name="line.209"></a>
-<span class="sourceLineNo">210</span> // read is actually the length of a single KeyValue<a name="line.210"></a>
-<span class="sourceLineNo">211</span> this.add(KeyValueUtil.create(versionOrLength, in));<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
-<span class="sourceLineNo">216</span> public void write(DataOutput out) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> LOG.warn("WALEdit is being serialized to writable - only expected in test code");<a name="line.217"></a>
-<span class="sourceLineNo">218</span> out.writeInt(VERSION_2);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> out.writeInt(cells.size());<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // We interleave the two lists for code simplicity<a name="line.220"></a>
-<span class="sourceLineNo">221</span> for (Cell cell : cells) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> // This is not used in any of the core code flows so it is just fine to convert to KV<a name="line.222"></a>
-<span class="sourceLineNo">223</span> KeyValue kv = KeyValueUtil.ensureKeyValue(cell);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> if (compressionContext != null) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> KeyValueCompression.writeKV(out, kv, compressionContext);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> } else{<a name="line.226"></a>
-<span class="sourceLineNo">227</span> KeyValueUtil.write(kv, out);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span> if (scopes == null) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> out.writeInt(0);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> } else {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> out.writeInt(scopes.size());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> for (byte[] key : scopes.keySet()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> Bytes.writeByteArray(out, key);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> out.writeInt(scopes.get(key));<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> }<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> /**<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * Reads WALEdit from cells.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @param cellDecoder Cell decoder.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * @param expectedCount Expected cell count.<a name="line.244"></a>
-<span class="sourceLineNo">245</span> * @return Number of KVs read.<a name="line.245"></a>
-<span class="sourceLineNo">246</span> */<a name="line.246"></a>
-<span class="sourceLineNo">247</span> public int readFromCells(Codec.Decoder cellDecoder, int expectedCount) throws IOException {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> cells.clear();<a name="line.248"></a>
-<span class="sourceLineNo">249</span> cells.ensureCapacity(expectedCount);<a name="line.249"></a>
-<span class="sourceLineNo">250</span> while (cells.size() < expectedCount && cellDecoder.advance()) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> cells.add(cellDecoder.current());<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> return cells.size();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> @Override<a name="line.256"></a>
-<span class="sourceLineNo">257</span> public long heapSize() {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> long ret = ClassSize.ARRAYLIST;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> for (Cell cell : cells) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> ret += CellUtil.estimatedHeapSizeOf(cell);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (scopes != null) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> ret += ClassSize.TREEMAP;<a name="line.263"></a>
-<span class="sourceLineNo">264</span> ret += ClassSize.align(scopes.size() * ClassSize.MAP_ENTRY);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> // TODO this isn't quite right, need help here<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> return ret;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span> @Override<a name="line.270"></a>
-<span class="sourceLineNo">271</span> public String toString() {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> StringBuilder sb = new StringBuilder();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> sb.append("[#edits: " + cells.size() + " = <");<a name="line.274"></a>
-<span class="sourceLineNo">275</span> for (Cell cell : cells) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> sb.append(cell);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> sb.append("; ");<a name="line.277"></a>
+<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * This is not thread safe.<a name="line.174"></a>
+<span class="sourceLineNo">175</span> * This will change the WALEdit and shouldn't be used unless you are sure that nothing<a name="line.175"></a>
+<span class="sourceLineNo">176</span> * else depends on the contents being immutable.<a name="line.176"></a>
+<span class="sourceLineNo">177</span> *<a name="line.177"></a>
+<span class="sourceLineNo">178</span> * @param cells the list of cells that this WALEdit now contains.<a name="line.178"></a>
+<span class="sourceLineNo">179</span> */<a name="line.179"></a>
+<span class="sourceLineNo">180</span> @InterfaceAudience.Private<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public void setCells(ArrayList<Cell> cells) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> this.cells = cells;<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> public NavigableMap<byte[], Integer> getAndRemoveScopes() {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> NavigableMap<byte[], Integer> result = scopes;<a name="line.186"></a>
+<span class="sourceLineNo">187</span> scopes = null;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return result;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
+<span class="sourceLineNo">192</span> public void readFields(DataInput in) throws IOException {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> cells.clear();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> if (scopes != null) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> scopes.clear();<a name="line.195"></a>
+<span class="sourceLineNo">196</span> }<a name="line.196"></a>
+<span class="sourceLineNo">197</span> int versionOrLength = in.readInt();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // TODO: Change version when we protobuf. Also, change way we serialize KV! Pb it too.<a name="line.198"></a>
+<span class="sourceLineNo">199</span> if (versionOrLength == VERSION_2) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> // this is new style WAL entry containing multiple KeyValues.<a name="line.200"></a>
+<span class="sourceLineNo">201</span> int numEdits = in.readInt();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> for (int idx = 0; idx < numEdits; idx++) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> if (compressionContext != null) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> this.add(KeyValueCompression.readKV(in, compressionContext));<a name="line.204"></a>
+<span class="sourceLineNo">205</span> } else {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> this.add(KeyValueUtil.create(in));<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> int numFamilies = in.readInt();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> if (numFamilies > 0) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> if (scopes == null) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> scopes = new TreeMap<byte[], Integer>(Bytes.BYTES_COMPARATOR);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> }<a name="line.213"></a>
+<span class="sourceLineNo">214</span> for (int i = 0; i < numFamilies; i++) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> byte[] fam = Bytes.readByteArray(in);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> int scope = in.readInt();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> scopes.put(fam, scope);<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> } else {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // this is an old style WAL entry. The int that we just<a name="line.221"></a>
+<span class="sourceLineNo">222</span> // read is actually the length of a single KeyValue<a name="line.222"></a>
+<span class="sourceLineNo">223</span> this.add(KeyValueUtil.create(versionOrLength, in));<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> @Override<a name="line.227"></a>
+<span class="sourceLineNo">228</span> public void write(DataOutput out) throws IOException {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> LOG.warn("WALEdit is being serialized to writable - only expected in test code");<a name="line.229"></a>
+<span class="sourceLineNo">230</span> out.writeInt(VERSION_2);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> out.writeInt(cells.size());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> // We interleave the two lists for code simplicity<a name="line.232"></a>
+<span class="sourceLineNo">233</span> for (Cell cell : cells) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> // This is not used in any of the core code flows so it is just fine to convert to KV<a name="line.234"></a>
+<span class="sourceLineNo">235</span> KeyValue kv = KeyValueUtil.ensureKeyValue(cell);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> if (compressionContext != null) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> KeyValueCompression.writeKV(out, kv, compressionContext);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> } else{<a name="line.238"></a>
+<span class="sourceLineNo">239</span> KeyValueUtil.write(kv, out);<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> if (scopes == null) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> out.writeInt(0);<a name="line.243"></a>
+<span class="sourceLineNo">244</span> } else {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> out.writeInt(scopes.size());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> for (byte[] key : scopes.keySet()) {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> Bytes.writeByteArray(out, key);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> out.writeInt(scopes.get(key));<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> /**<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * Reads WALEdit from cells.<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @param cellDecoder Cell decoder.<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @param expectedCount Expected cell count.<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * @return Number of KVs read.<a name="line.257"></a>
+<span class="sourceLineNo">258</span> */<a name="line.258"></a>
+<span class="sourceLineNo">259</span> public int readFromCells(Codec.Decoder cellDecoder, int expectedCount) throws IOException {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> cells.clear();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> cells.ensureCapacity(expectedCount);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> while (cells.size() < expectedCount && cellDecoder.advance()) {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> cells.add(cellDecoder.current());<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return cells.size();<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> @Override<a name="line.268"></a>
+<span class="sourceLineNo">269</span> public long heapSize() {<a name="line.269"></a>
+<span class="sourceLineNo">270</span> long ret = ClassSize.ARRAYLIST;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> for (Cell cell : cells) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> ret += CellUtil.estimatedHeapSizeOf(cell);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span> if (scopes != null) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> ret += ClassSize.TREEMAP;<a name="line.275"></a>
+<span class="sourceLineNo">276</span> ret += ClassSize.align(scopes.size() * ClassSize.MAP_ENTRY);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> // TODO this isn't quite right, need help here<a name="line.277"></a>
<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (scopes != null) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> sb.append(" scopes: " + scopes.toString());<a name="line.280"></a>
-<span class="sourceLineNo">281</span> }<a name="line.281"></a>
-<span class="sourceLineNo">282</span> sb.append(">]");<a name="line.282"></a>
-<span class="sourceLineNo">283</span> return sb.toString();<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">279</span> return ret;<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> @Override<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public String toString() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> StringBuilder sb = new StringBuilder();<a name="line.284"></a>
<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> public static WALEdit createFlushWALEdit(HRegionInfo hri, FlushDescriptor f) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, FLUSH,<a name="line.287"></a>
-<span class="sourceLineNo">288</span> EnvironmentEdgeManager.currentTime(), f.toByteArray());<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return new WALEdit().add(kv);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> public static FlushDescriptor getFlushDescriptor(Cell cell) throws IOException {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> if (CellUtil.matchingColumn(cell, METAFAMILY, FLUSH)) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> return FlushDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> return null;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span> public static WALEdit createRegionEventWALEdit(HRegionInfo hri,<a name="line.299"></a>
-<span class="sourceLineNo">300</span> RegionEventDescriptor regionEventDesc) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, REGION_EVENT,<a name="line.301"></a>
-<span class="sourceLineNo">302</span> EnvironmentEdgeManager.currentTime(), regionEventDesc.toByteArray());<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return new WALEdit().add(kv);<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> public static RegionEventDescriptor getRegionEventDescriptor(Cell cell) throws IOException {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> if (CellUtil.matchingColumn(cell, METAFAMILY, REGION_EVENT)) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> return RegionEventDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return null;<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">314</span> * Create a compaction WALEdit<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param c<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * @return A WALEdit that has <code>c</code> serialized as its value<a name="line.316"></a>
-<span class="sourceLineNo">317</span> */<a name="line.317"></a>
-<span class="sourceLineNo">318</span> public static WALEdit createCompaction(final HRegionInfo hri, final CompactionDescriptor c) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> byte [] pbbytes = c.toByteArray();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, COMPACTION,<a name="line.320"></a>
-<span class="sourceLineNo">321</span> EnvironmentEdgeManager.currentTime(), pbbytes);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> return new WALEdit().add(kv); //replication scope null so that this won't be replicated<a name="line.322"></a>
+<span class="sourceLineNo">286</span> sb.append("[#edits: " + cells.size() + " = <");<a name="line.286"></a>
+<span class="sourceLineNo">287</span> for (Cell cell : cells) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> sb.append(cell);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> sb.append("; ");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span> if (scopes != null) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> sb.append(" scopes: " + scopes.toString());<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> sb.append(">]");<a name="line.294"></a>
+<span class="sourceLineNo">295</span> return sb.toString();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> public static WALEdit createFlushWALEdit(HRegionInfo hri, FlushDescriptor f) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, FLUSH,<a name="line.299"></a>
+<span class="sourceLineNo">300</span> EnvironmentEdgeManager.currentTime(), f.toByteArray());<a name="line.300"></a>
+<span class="sourceLineNo">301</span> return new WALEdit().add(kv);<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> public static FlushDescriptor getFlushDescriptor(Cell cell) throws IOException {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (CellUtil.matchingColumn(cell, METAFAMILY, FLUSH)) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> return FlushDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> return null;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> public static WALEdit createRegionEventWALEdit(HRegionInfo hri,<a name="line.311"></a>
+<span class="sourceLineNo">312</span> RegionEventDescriptor regionEventDesc) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, REGION_EVENT,<a name="line.313"></a>
+<span class="sourceLineNo">314</span> EnvironmentEdgeManager.currentTime(), regionEventDesc.toByteArray());<a name="line.314"></a>
+<span class="sourceLineNo">315</span> return new WALEdit().add(kv);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> public static RegionEventDescriptor getRegionEventDescriptor(Cell cell) throws IOException {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> if (CellUtil.matchingColumn(cell, METAFAMILY, REGION_EVENT)) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> return RegionEventDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> return null;<a name="line.322"></a>
<span class="sourceLineNo">323</span> }<a name="line.323"></a>
<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> private static byte[] getRowForRegion(HRegionInfo hri) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> byte[] startKey = hri.getStartKey();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> if (startKey.length == 0) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> // empty row key is not allowed in mutations because it is both the start key and the end key<a name="line.328"></a>
-<span class="sourceLineNo">329</span> // we return the smallest byte[] that is bigger (in lex comparison) than byte[0].<a name="line.329"></a>
-<span class="sourceLineNo">330</span> return new byte[] {0};<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span> return startKey;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> /**<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * Deserialized and returns a CompactionDescriptor is the KeyValue contains one.<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * @param kv the key value<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @return deserialized CompactionDescriptor or null.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> public static CompactionDescriptor getCompaction(Cell kv) throws IOException {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (CellUtil.matchingColumn(kv, METAFAMILY, COMPACTION)) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return CompactionDescriptor.parseFrom(CellUtil.cloneValue(kv));<a name="line.342"></a>
+<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * Create a compaction WALEdit<a name="line.326"></a>
+<span class="sourceLineNo">327</span> * @param c<a name="line.327"></a>
+<span class="sourceLineNo">328</span> * @return A WALEdit that has <code>c</code> serialized as its value<a name="line.328"></a>
+<span class="sourceLineNo">329</span> */<a name="line.329"></a>
+<span class="sourceLineNo">330</span> public static WALEdit createCompaction(final HRegionInfo hri, final CompactionDescriptor c) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> byte [] pbbytes = c.toByteArray();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> KeyValue kv = new KeyValue(getRowForRegion(hri), METAFAMILY, COMPACTION,<a name="line.332"></a>
+<span class="sourceLineNo">333</span> EnvironmentEdgeManager.currentTime(), pbbytes);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> return new WALEdit().add(kv); //replication scope null so that this won't be replicated<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> private static byte[] getRowForRegion(HRegionInfo hri) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> byte[] startKey = hri.getStartKey();<a name="line.338"></a>
+<span class="sourceLineNo">339</span> if (startKey.length == 0) {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // empty row key is not allowed in mutations because it is both the start key and the end key<a name="line.340"></a>
+<span class="sourceLineNo">341</span> // we return the smallest byte[] that is bigger (in lex comparison) than byte[0].<a name="line.341"></a>
+<span class="sourceLineNo">342</span> return new byte[] {0};<a name="line.342"></a>
<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return null;<a name="line.344"></a>
+<span class="sourceLineNo">344</span> return startKey;<a name="line.344"></a>
<span class="sourceLineNo">345</span> }<a name="line.345"></a>
<span class="sourceLineNo">346</span><a name="line.346"></a>
<span class="sourceLineNo">347</span> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Create a bulk loader WALEdit<a name="line.348"></a>
-<span class="sourceLineNo">349</span> *<a name="line.349"></a>
-<span class="sourceLineNo">350</span> * @param hri The HRegionInfo for the region in which we are bulk loading<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * @param bulkLoadDescriptor The descriptor for the Bulk Loader<a name="line.351"></a>
-<span class="sourceLineNo">352</span> * @return The WALEdit for the BulkLoad<a name="line.352"></a>
-<span class="sourceLineNo">353</span> */<a name="line.353"></a>
-<span class="sourceLineNo">354</span> public static WALEdit createBulkLoadEvent(HRegionInfo hri,<a name="line.354"></a>
-<span class="sourceLineNo">355</span> WALProtos.BulkLoadDescriptor bulkLoadDescriptor) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> KeyValue kv = new KeyValue(getRowForRegion(hri),<a name="line.356"></a>
-<span class="sourceLineNo">357</span> METAFAMILY,<a name="line.357"></a>
-<span class="sourceLineNo">358</span> BULK_LOAD,<a name="line.358"></a>
-<span class="sourceLineNo">359</span> EnvironmentEdgeManager.currentTime(),<a name="line.359"></a>
-<span class="sourceLineNo">360</span> bulkLoadDescriptor.toByteArray());<a name="line.360"></a>
-<span class="sourceLineNo">361</span> return new WALEdit().add(kv);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> /**<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * Deserialized and returns a BulkLoadDescriptor from the passed in Cell<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @param cell the key value<a name="line.366"></a>
-<span class="sourceLineNo">367</span> * @return deserialized BulkLoadDescriptor or null.<a name="line.367"></a>
-<span class="sourceLineNo">368</span> */<a name="line.368"></a>
-<span class="sourceLineNo">369</span> public static WALProtos.BulkLoadDescriptor getBulkLoadDescriptor(Cell cell) throws IOException {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> if (CellUtil.matchingColumn(cell, METAFAMILY, BULK_LOAD)) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> return WALProtos.BulkLoadDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return null;<a name="line.373"></a>
+<span class="sourceLineNo">348</span> * Deserialized and returns a CompactionDescriptor is the KeyValue contains one.<a name="line.348"></a>
+<span class="sourceLineNo">349</span> * @param kv the key value<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * @return deserialized CompactionDescriptor or null.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> */<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public static CompactionDescriptor getCompaction(Cell kv) throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (CellUtil.matchingColumn(kv, METAFAMILY, COMPACTION)) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> return CompactionDescriptor.parseFrom(CellUtil.cloneValue(kv));<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> return null;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
+<span class="sourceLineNo">360</span> * Create a bulk loader WALEdit<a name="line.360"></a>
+<span class="sourceLineNo">361</span> *<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * @param hri The HRegionInfo for the region in which we are bulk loading<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * @param bulkLoadDescriptor The descriptor for the Bulk Loader<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * @return The WALEdit for the BulkLoad<a name="line.364"></a>
+<span class="sourceLineNo">365</span> */<a name="line.365"></a>
+<span class="sourceLineNo">366</span> public static WALEdit createBulkLoadEvent(HRegionInfo hri,<a name="line.366"></a>
+<span class="sourceLineNo">367</span> WALProtos.BulkLoadDescriptor bulkLoadDescriptor) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> KeyValue kv = new KeyValue(getRowForRegion(hri),<a name="line.368"></a>
+<span class="sourceLineNo">369</span> METAFAMILY,<a name="line.369"></a>
+<span class="sourceLineNo">370</span> BULK_LOAD,<a name="line.370"></a>
+<span class="sourceLineNo">371</span> EnvironmentEdgeManager.currentTime(),<a name="line.371"></a>
+<span class="sourceLineNo">372</span> bulkLoadDescriptor.toByteArray());<a name="line.372"></a>
+<span class="sourceLineNo">373</span> return new WALEdit().add(kv);<a name="line.373"></a>
<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>}<a name="line.375"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> /**<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * Deserialized and returns a BulkLoadDescriptor from the passed in Cell<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @param cell the key value<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * @return deserialized BulkLoadDescriptor or null.<a name="line.379"></a>
+<span class="sourceLineNo">380</span> */<a name="line.380"></a>
+<span class="sourceLineNo">381</span> public static WALProtos.BulkLoadDescriptor getBulkLoadDescriptor(Cell cell) throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> if (CellUtil.matchingColumn(cell, METAFAMILY, BULK_LOAD)) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> return WALProtos.BulkLoadDescriptor.parseFrom(CellUtil.cloneValue(cell));<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span> return null;<a name="line.385"></a>
+<span class="sourceLineNo">386</span> }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>}<a name="line.387"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/32d40534/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.Replicator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.Replicator.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.Replicator.html
index e6f7370..66fe895 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.Replicator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/HBaseInterClusterReplicationEndpoint.Replicator.html
@@ -151,9 +151,9 @@
<span class="sourceLineNo">143</span> int sleepMultiplier = 1;<a name="line.143"></a>
<span class="sourceLineNo">144</span><a name="line.144"></a>
<span class="sourceLineNo">145</span> // Connect to peer cluster first, unless we have to stop<a name="line.145"></a>
-<span class="sourceLineNo">146</span> while (this.isRunning() && replicationSinkMgr.getSinks().size() == 0) {<a name="line.146"></a>
+<span class="sourceLineNo">146</span> while (this.isRunning() && replicationSinkMgr.getNumSinks() == 0) {<a name="line.146"></a>
<span class="sourceLineNo">147</span> replicationSinkMgr.chooseSinks();<a name="line.147"></a>
-<span class="sourceLineNo">148</span> if (this.isRunning() && replicationSinkMgr.getSinks().size() == 0) {<a name="line.148"></a>
+<span class="sourceLineNo">148</span> if (this.isRunning() && replicationSinkMgr.getNumSinks() == 0) {<a name="line.148"></a>
<span class="sourceLineNo">149</span> if (sleepForRetries("Waiting for peers", sleepMultiplier)) {<a name="line.149"></a>
<span class="sourceLineNo">150</span> sleepMultiplier++;<a name="line.150"></a>
<span class="sourceLineNo">151</span> }<a name="line.151"></a>
@@ -188,177 +188,192 @@
<span class="sourceLineNo">180</span> List<Entry> entries = replicateContext.getEntries();<a name="line.180"></a>
<span class="sourceLineNo">181</span> String walGroupId = replicateContext.getWalGroupId();<a name="line.181"></a>
<span class="sourceLineNo">182</span> int sleepMultiplier = 1;<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> if (!peersSelected && this.isRunning()) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> connectToPeers();<a name="line.185"></a>
-<span class="sourceLineNo">186</span> peersSelected = true;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> if (replicationSinkMgr.getSinks().size() == 0) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return false;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // minimum of: configured threads, number of 100-waledit batches,<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // and number of current sinks<a name="line.193"></a>
-<span class="sourceLineNo">194</span> int n = Math.min(Math.min(this.maxThreads, entries.size()/100+1),<a name="line.194"></a>
-<span class="sourceLineNo">195</span> replicationSinkMgr.getSinks().size());<a name="line.195"></a>
-<span class="sourceLineNo">196</span> List<List<Entry>> entryLists = new ArrayList<List<Entry>>(n);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (n == 1) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> entryLists.add(entries);<a name="line.198"></a>
-<span class="sourceLineNo">199</span> } else {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> for (int i=0; i<n; i++) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> entryLists.add(new ArrayList<Entry>(entries.size()/n+1));<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // now group by region<a name="line.203"></a>
-<span class="sourceLineNo">204</span> for (Entry e : entries) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> entryLists.get(Math.abs(Bytes.hashCode(e.getKey().getEncodedRegionName())%n)).add(e);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> while (this.isRunning()) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> if (!isPeerEnabled()) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> if (sleepForRetries("Replication is disabled", sleepMultiplier)) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> sleepMultiplier++;<a name="line.211"></a>
-<span class="sourceLineNo">212</span> }<a name="line.212"></a>
-<span class="sourceLineNo">213</span> continue;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span> try {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (LOG.isTraceEnabled()) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> LOG.trace("Replicating " + entries.size() +<a name="line.217"></a>
-<span class="sourceLineNo">218</span> " entries of total size " + replicateContext.getSize());<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> int futures = 0;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> for (int i=0; i<entryLists.size(); i++) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> if (!entryLists.get(i).isEmpty()) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> if (LOG.isTraceEnabled()) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> LOG.trace("Submitting " + entryLists.get(i).size() +<a name="line.225"></a>
-<span class="sourceLineNo">226</span> " entries of total size " + replicateContext.getSize());<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span> // RuntimeExceptions encountered here bubble up and are handled in ReplicationSource<a name="line.228"></a>
-<span class="sourceLineNo">229</span> pool.submit(createReplicator(entryLists.get(i), i));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> futures++;<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span> IOException iox = null;<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> for (int i=0; i<futures; i++) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> try {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> // wait for all futures, remove successful parts<a name="line.237"></a>
-<span class="sourceLineNo">238</span> // (only the remaining parts will be retried)<a name="line.238"></a>
-<span class="sourceLineNo">239</span> Future<Integer> f = pool.take();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> entryLists.set(f.get().intValue(), Collections.<Entry>emptyList());<a name="line.240"></a>
-<span class="sourceLineNo">241</span> } catch (InterruptedException ie) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> iox = new IOException(ie);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } catch (ExecutionException ee) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> // cause must be an IOException<a name="line.244"></a>
-<span class="sourceLineNo">245</span> iox = (IOException)ee.getCause();<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> if (iox != null) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> // if we had any exceptions, try again<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw iox;<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span> // update metrics<a name="line.252"></a>
-<span class="sourceLineNo">253</span> this.metrics.setAgeOfLastShippedOp(entries.get(entries.size() - 1).getKey().getWriteTime(),<a name="line.253"></a>
-<span class="sourceLineNo">254</span> walGroupId);<a name="line.254"></a>
-<span class="sourceLineNo">255</span> return true;<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> } catch (IOException ioe) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> // Didn't ship anything, but must still age the last time we did<a name="line.258"></a>
-<span class="sourceLineNo">259</span> this.metrics.refreshAgeOfLastShippedOp(walGroupId);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (ioe instanceof RemoteException) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> ioe = ((RemoteException) ioe).unwrapRemoteException();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> LOG.warn("Can't replicate because of an error on the remote cluster: ", ioe);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (ioe instanceof TableNotFoundException) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (sleepForRetries("A table is missing in the peer cluster. "<a name="line.264"></a>
-<span class="sourceLineNo">265</span> + "Replication cannot proceed without losing data.", sleepMultiplier)) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> sleepMultiplier++;<a name="line.266"></a>
-<span class="sourceLineNo">267</span> }<a name="line.267"></a>
-<span class="sourceLineNo">268</span> }<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> if (ioe instanceof SocketTimeoutException) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> // This exception means we waited for more than 60s and nothing<a name="line.271"></a>
-<span class="sourceLineNo">272</span> // happened, the cluster is alive and calling it right away<a name="line.272"></a>
-<span class="sourceLineNo">273</span> // even for a test just makes things worse.<a name="line.273"></a>
-<span class="sourceLineNo">274</span> sleepForRetries("Encountered a SocketTimeoutException. Since the " +<a name="line.274"></a>
-<span class="sourceLineNo">275</span> "call to the remote cluster timed out, which is usually " +<a name="line.275"></a>
-<span class="sourceLineNo">276</span> "caused by a machine failure or a massive slowdown",<a name="line.276"></a>
-<span class="sourceLineNo">277</span> this.socketTimeoutMultiplier);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> } else if (ioe instanceof ConnectException) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> LOG.warn("Peer is unavailable, rechecking all sinks: ", ioe);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> replicationSinkMgr.chooseSinks();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> } else {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> LOG.warn("Can't replicate because of a local or network error: ", ioe);<a name="line.282"></a>
+<span class="sourceLineNo">183</span> int numReplicated = 0;<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> if (!peersSelected && this.isRunning()) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> connectToPeers();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> peersSelected = true;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span> int numSinks = replicationSinkMgr.getNumSinks();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (numSinks == 0) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> LOG.warn("No replication sinks found, returning without replicating. The source should retry"<a name="line.192"></a>
+<span class="sourceLineNo">193</span> + " with the same set of edits.");<a name="line.193"></a>
+<span class="sourceLineNo">194</span> return false;<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> // minimum of: configured threads, number of 100-waledit batches,<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // and number of current sinks<a name="line.198"></a>
+<span class="sourceLineNo">199</span> int n = Math.min(Math.min(this.maxThreads, entries.size()/100+1), numSinks);<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> List<List<Entry>> entryLists = new ArrayList<List<Entry>>(n);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (n == 1) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> entryLists.add(entries);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> } else {<a name="line.204"></a>
+<span class="sourceLineNo">205</span> for (int i=0; i<n; i++) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> entryLists.add(new ArrayList<Entry>(entries.size()/n+1));<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> // now group by region<a name="line.208"></a>
+<span class="sourceLineNo">209</span> for (Entry e : entries) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> entryLists.get(Math.abs(Bytes.hashCode(e.getKey().getEncodedRegionName())%n)).add(e);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> while (this.isRunning()) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> if (!isPeerEnabled()) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if (sleepForRetries("Replication is disabled", sleepMultiplier)) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> sleepMultiplier++;<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> continue;<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> if (LOG.isTraceEnabled()) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> LOG.trace("Replicating " + entries.size() +<a name="line.222"></a>
+<span class="sourceLineNo">223</span> " entries of total size " + replicateContext.getSize());<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> int futures = 0;<a name="line.226"></a>
+<span class="sourceLineNo">227</span> for (int i=0; i<entryLists.size(); i++) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> if (!entryLists.get(i).isEmpty()) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (LOG.isTraceEnabled()) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> LOG.trace("Submitting " + entryLists.get(i).size() +<a name="line.230"></a>
+<span class="sourceLineNo">231</span> " entries of total size " + replicateContext.getSize());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> // RuntimeExceptions encountered here bubble up and are handled in ReplicationSource<a name="line.233"></a>
+<span class="sourceLineNo">234</span> pool.submit(createReplicator(entryLists.get(i), i));<a name="line.234"></a>
+<span class="sourceLineNo">235</span> futures++;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span> IOException iox = null;<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> for (int i=0; i<futures; i++) {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // wait for all futures, remove successful parts<a name="line.242"></a>
+<span class="sourceLineNo">243</span> // (only the remaining parts will be retried)<a name="line.243"></a>
+<span class="sourceLineNo">244</span> Future<Integer> f = pool.take();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> int index = f.get().intValue();<a name="line.245"></a>
+<span class="sourceLineNo">246</span> int batchSize = entryLists.get(index).size();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> entryLists.set(index, Collections.<Entry>emptyList());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> // Now, we have marked the batch as done replicating, record its size<a name="line.248"></a>
+<span class="sourceLineNo">249</span> numReplicated += batchSize;<a name="line.249"></a>
+<span class="sourceLineNo">250</span> } catch (InterruptedException ie) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> iox = new IOException(ie);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> } catch (ExecutionException ee) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // cause must be an IOException<a name="line.253"></a>
+<span class="sourceLineNo">254</span> iox = (IOException)ee.getCause();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (iox != null) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> // if we had any exceptions, try again<a name="line.258"></a>
+<span class="sourceLineNo">259</span> throw iox;<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (numReplicated != entries.size()) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> // Something went wrong here and we don't know what, let's just fail and retry.<a name="line.262"></a>
+<span class="sourceLineNo">263</span> LOG.warn("The number of edits replicated is different from the number received,"<a name="line.263"></a>
+<span class="sourceLineNo">264</span> + " failing for now.");<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return false;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> // update metrics<a name="line.267"></a>
+<span class="sourceLineNo">268</span> this.metrics.setAgeOfLastShippedOp(entries.get(entries.size() - 1).getKey().getWriteTime(),<a name="line.268"></a>
+<span class="sourceLineNo">269</span> walGroupId);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> return true;<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> } catch (IOException ioe) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> // Didn't ship anything, but must still age the last time we did<a name="line.273"></a>
+<span class="sourceLineNo">274</span> this.metrics.refreshAgeOfLastShippedOp(walGroupId);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (ioe instanceof RemoteException) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> ioe = ((RemoteException) ioe).unwrapRemoteException();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> LOG.warn("Can't replicate because of an error on the remote cluster: ", ioe);<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (ioe instanceof TableNotFoundException) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (sleepForRetries("A table is missing in the peer cluster. "<a name="line.279"></a>
+<span class="sourceLineNo">280</span> + "Replication cannot proceed without losing data.", sleepMultiplier)) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> sleepMultiplier++;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span> if (sleepForRetries("Since we are unable to replicate", sleepMultiplier)) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> sleepMultiplier++;<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> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> return false; // in case we exited before replicating<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> protected boolean isPeerEnabled() {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> return ctx.getReplicationPeer().getPeerState() == PeerState.ENABLED;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> @Override<a name="line.297"></a>
-<span class="sourceLineNo">298</span> protected void doStop() {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> disconnect(); //don't call super.doStop()<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (this.conn != null) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> try {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> this.conn.close();<a name="line.302"></a>
-<span class="sourceLineNo">303</span> this.conn = null;<a name="line.303"></a>
-<span class="sourceLineNo">304</span> } catch (IOException e) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> LOG.warn("Failed to close the connection");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> exec.shutdownNow();<a name="line.308"></a>
-<span class="sourceLineNo">309</span> notifyStopped();<a name="line.309"></a>
+<span class="sourceLineNo">284</span> } else {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (ioe instanceof SocketTimeoutException) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> // This exception means we waited for more than 60s and nothing<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // happened, the cluster is alive and calling it right away<a name="line.287"></a>
+<span class="sourceLineNo">288</span> // even for a test just makes things worse.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> sleepForRetries("Encountered a SocketTimeoutException. Since the " +<a name="line.289"></a>
+<span class="sourceLineNo">290</span> "call to the remote cluster timed out, which is usually " +<a name="line.290"></a>
+<span class="sourceLineNo">291</span> "caused by a machine failure or a massive slowdown",<a name="line.291"></a>
+<span class="sourceLineNo">292</span> this.socketTimeoutMultiplier);<a name="line.292"></a>
+<span class="sourceLineNo">293</span> } else if (ioe instanceof ConnectException) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LOG.warn("Peer is unavailable, rechecking all sinks: ", ioe);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> replicationSinkMgr.chooseSinks();<a name="line.295"></a>
+<span class="sourceLineNo">296</span> } else {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> LOG.warn("Can't replicate because of a local or network error: ", ioe);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> if (sleepForRetries("Since we are unable to replicate", sleepMultiplier)) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> sleepMultiplier++;<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> return false; // in case we exited before replicating<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> protected boolean isPeerEnabled() {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> return ctx.getReplicationPeer().getPeerState() == PeerState.ENABLED;<a name="line.309"></a>
<span class="sourceLineNo">310</span> }<a name="line.310"></a>
<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> // is this needed? Nobody else will call doStop() otherwise<a name="line.312"></a>
-<span class="sourceLineNo">313</span> @Override<a name="line.313"></a>
-<span class="sourceLineNo">314</span> public State stopAndWait() {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> doStop();<a name="line.315"></a>
-<span class="sourceLineNo">316</span> return super.stopAndWait();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> @VisibleForTesting<a name="line.319"></a>
-<span class="sourceLineNo">320</span> protected Replicator createReplicator(List<Entry> entries, int ordinal) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> return new Replicator(entries, ordinal);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> @VisibleForTesting<a name="line.324"></a>
-<span class="sourceLineNo">325</span> protected class Replicator implements Callable<Integer> {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> private List<Entry> entries;<a name="line.326"></a>
-<span class="sourceLineNo">327</span> private int ordinal;<a name="line.327"></a>
-<span class="sourceLineNo">328</span> public Replicator(List<Entry> entries, int ordinal) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> this.entries = entries;<a name="line.329"></a>
-<span class="sourceLineNo">330</span> this.ordinal = ordinal;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @Override<a name="line.333"></a>
-<span class="sourceLineNo">334</span> public Integer call() throws IOException {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> SinkPeer sinkPeer = null;<a name="line.335"></a>
-<span class="sourceLineNo">336</span> try {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> sinkPeer = replicationSinkMgr.getReplicationSink();<a name="line.337"></a>
-<span class="sourceLineNo">338</span> BlockingInterface rrs = sinkPeer.getRegionServer();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> ReplicationProtbufUtil.replicateWALEntry(rrs, entries.toArray(new Entry[entries.size()]),<a name="line.339"></a>
-<span class="sourceLineNo">340</span> replicationClusterId, baseNamespaceDir, hfileArchiveDir);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> replicationSinkMgr.reportSinkSuccess(sinkPeer);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> return ordinal;<a name="line.342"></a>
-<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> } catch (IOException ioe) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> if (sinkPeer != null) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> replicationSinkMgr.reportBadSink(sinkPeer);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> throw ioe;<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>}<a name="line.353"></a>
+<span class="sourceLineNo">312</span> @Override<a name="line.312"></a>
+<span class="sourceLineNo">313</span> protected void doStop() {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> disconnect(); //don't call super.doStop()<a name="line.314"></a>
+<span class="sourceLineNo">315</span> if (this.conn != null) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> try {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> this.conn.close();<a name="line.317"></a>
+<span class="sourceLineNo">318</span> this.conn = null;<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } catch (IOException e) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> LOG.warn("Failed to close the connection");<a name="line.320"></a>
+<span class="sourceLineNo">321</span> }<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span> exec.shutdownNow();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> notifyStopped();<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> // is this needed? Nobody else will call doStop() otherwise<a name="line.327"></a>
+<span class="sourceLineNo">328</span> @Override<a name="line.328"></a>
+<span class="sourceLineNo">329</span> public State stopAndWait() {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> doStop();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> return super.stopAndWait();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> @VisibleForTesting<a name="line.334"></a>
+<span class="sourceLineNo">335</span> protected Replicator createReplicator(List<Entry> entries, int ordinal) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return new Replicator(entries, ordinal);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> @VisibleForTesting<a name="line.339"></a>
+<span class="sourceLineNo">340</span> protected class Replicator implements Callable<Integer> {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> private List<Entry> entries;<a name="line.341"></a>
+<span class="sourceLineNo">342</span> private int ordinal;<a name="line.342"></a>
+<span class="sourceLineNo">343</span> public Replicator(List<Entry> entries, int ordinal) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> this.entries = entries;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> this.ordinal = ordinal;<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> @Override<a name="line.348"></a>
+<span class="sourceLineNo">349</span> public Integer call() throws IOException {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> SinkPeer sinkPeer = null;<a name="line.350"></a>
+<span class="sourceLineNo">351</span> try {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> sinkPeer = replicationSinkMgr.getReplicationSink();<a name="line.352"></a>
+<span class="sourceLineNo">353</span> BlockingInterface rrs = sinkPeer.getRegionServer();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> ReplicationProtbufUtil.replicateWALEntry(rrs, entries.toArray(new Entry[entries.size()]),<a name="line.354"></a>
+<span class="sourceLineNo">355</span> replicationClusterId, baseNamespaceDir, hfileArchiveDir);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> replicationSinkMgr.reportSinkSuccess(sinkPeer);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return ordinal;<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span> } catch (IOException ioe) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (sinkPeer != null) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> replicationSinkMgr.reportBadSink(sinkPeer);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> throw ioe;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span>}<a name="line.368"></a>