http://git-wip-us.apache.org/repos/asf/hbase-site/blob/0b638133/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.html
b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.html
index 928cae1..0dbf815 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.html
@@ -140,216 +140,226 @@
<span class="sourceLineNo">132</span> checkPeerConfig(peerConfig);<a
name="line.132"></a>
<span class="sourceLineNo">133</span> ReplicationPeerDescription desc =
checkPeerExists(peerId);<a name="line.133"></a>
<span class="sourceLineNo">134</span> ReplicationPeerConfig oldPeerConfig =
desc.getPeerConfig();<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if
(!StringUtils.isBlank(peerConfig.getClusterKey()) &&<a
name="line.135"></a>
-<span class="sourceLineNo">136</span>
!peerConfig.getClusterKey().equals(oldPeerConfig.getClusterKey())) {<a
name="line.136"></a>
-<span class="sourceLineNo">137</span> throw new DoNotRetryIOException(<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> "Changing the cluster key on an
existing peer is not allowed. Existing key '" +<a name="line.138"></a>
-<span class="sourceLineNo">139</span> oldPeerConfig.getClusterKey()
+ "' for peer " + peerId + " does not match new key '" +<a name="line.139"></a>
-<span class="sourceLineNo">140</span> peerConfig.getClusterKey() +
"'");<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> if
(!StringUtils.isBlank(peerConfig.getReplicationEndpointImpl()) &&<a
name="line.143"></a>
-<span class="sourceLineNo">144</span>
!peerConfig.getReplicationEndpointImpl().equals(oldPeerConfig.getReplicationEndpointImpl()))
{<a name="line.144"></a>
-<span class="sourceLineNo">145</span> throw new
DoNotRetryIOException("Changing the replication endpoint implementation class "
+<a name="line.145"></a>
-<span class="sourceLineNo">146</span> "on an existing peer is not
allowed. Existing class '" +<a name="line.146"></a>
-<span class="sourceLineNo">147</span>
oldPeerConfig.getReplicationEndpointImpl() + "' for peer " + peerId +<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> " does not match new class '" +
peerConfig.getReplicationEndpointImpl() + "'");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> public void addPeer(String peerId,
ReplicationPeerConfig peerConfig, boolean enabled)<a name="line.152"></a>
-<span class="sourceLineNo">153</span> throws ReplicationException {<a
name="line.153"></a>
-<span class="sourceLineNo">154</span> if (peers.containsKey(peerId)) {<a
name="line.154"></a>
-<span class="sourceLineNo">155</span> // this should be a retry, just
return<a name="line.155"></a>
-<span class="sourceLineNo">156</span> return;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span> ReplicationPeerConfig
copiedPeerConfig = ReplicationPeerConfig.newBuilder(peerConfig).build();<a
name="line.158"></a>
-<span class="sourceLineNo">159</span> peerStorage.addPeer(peerId,
copiedPeerConfig, enabled);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, copiedPeerConfig));<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 removePeer(String peerId)
throws ReplicationException {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> if (!peers.containsKey(peerId)) {<a
name="line.164"></a>
-<span class="sourceLineNo">165</span> // this should be a retry, just
return<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span> peerStorage.removePeer(peerId);<a
name="line.168"></a>
-<span class="sourceLineNo">169</span> peers.remove(peerId);<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> private void setPeerState(String
peerId, boolean enabled) throws ReplicationException {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> if (desc.isEnabled() == enabled) {<a
name="line.174"></a>
-<span class="sourceLineNo">175</span> // this should be a retry, just
return<a name="line.175"></a>
-<span class="sourceLineNo">176</span> return;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> peerStorage.setPeerState(peerId,
enabled);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, desc.getPeerConfig()));<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> public void enablePeer(String peerId)
throws ReplicationException {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> setPeerState(peerId, true);<a
name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> public void disablePeer(String peerId)
throws ReplicationException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> setPeerState(peerId, false);<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> public void updatePeerConfig(String
peerId, ReplicationPeerConfig peerConfig)<a name="line.190"></a>
-<span class="sourceLineNo">191</span> throws ReplicationException {<a
name="line.191"></a>
-<span class="sourceLineNo">192</span> // the checking rules are too
complicated here so we give up checking whether this is a retry.<a
name="line.192"></a>
-<span class="sourceLineNo">193</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> ReplicationPeerConfig oldPeerConfig =
desc.getPeerConfig();<a name="line.194"></a>
-<span class="sourceLineNo">195</span> ReplicationPeerConfigBuilder
newPeerConfigBuilder =<a name="line.195"></a>
-<span class="sourceLineNo">196</span>
ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // we need to use the new conf to
overwrite the old one.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());<a
name="line.198"></a>
-<span class="sourceLineNo">199</span>
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());<a
name="line.199"></a>
-<span class="sourceLineNo">200</span>
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());<a
name="line.200"></a>
-<span class="sourceLineNo">201</span>
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());<a
name="line.201"></a>
-<span class="sourceLineNo">202</span> ReplicationPeerConfig newPeerConfig =
newPeerConfigBuilder.build();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> peerStorage.updatePeerConfig(peerId,
newPeerConfig);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, desc.isEnabled(), newPeerConfig));<a
name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> public
List<ReplicationPeerDescription> listPeers(Pattern pattern) {<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> if (pattern == null) {<a
name="line.208"></a>
-<span class="sourceLineNo">209</span> return new
ArrayList<>(peers.values());<a name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
-<span class="sourceLineNo">211</span> return
peers.values().stream().filter(r ->
pattern.matcher(r.getPeerId()).matches())<a name="line.211"></a>
-<span class="sourceLineNo">212</span> .collect(Collectors.toList());<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> public
Optional<ReplicationPeerConfig> getPeerConfig(String peerId) {<a
name="line.215"></a>
-<span class="sourceLineNo">216</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> return desc != null ?
Optional.of(desc.getPeerConfig()) : Optional.empty();<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> public void
removeAllQueuesAndHFileRefs(String peerId) throws ReplicationException {<a
name="line.220"></a>
-<span class="sourceLineNo">221</span> // Here we need two passes to address
the problem of claimQueue. Maybe a claimQueue is still<a name="line.221"></a>
-<span class="sourceLineNo">222</span> // on-going when the refresh peer
config procedure is done, if a RS which has already been<a name="line.222"></a>
-<span class="sourceLineNo">223</span> // scanned claims the queue of a RS
which has not been scanned yet, we will miss that queue in<a
name="line.223"></a>
-<span class="sourceLineNo">224</span> // the scan here, and if the RS who
has claimed the queue crashed before creating recovered<a name="line.224"></a>
-<span class="sourceLineNo">225</span> // source, then the queue will leave
there until the another RS detects the crash and helps<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // removing the queue.<a
name="line.226"></a>
-<span class="sourceLineNo">227</span> // A two pass scan can solve the
problem. Anyway, the queue will not disappear during the<a name="line.227"></a>
-<span class="sourceLineNo">228</span> // claiming, it will either under the
old RS or under the new RS, and a queue can only be<a name="line.228"></a>
-<span class="sourceLineNo">229</span> // claimed once after the refresh
peer procedure done(as the next claim queue will just delete<a
name="line.229"></a>
-<span class="sourceLineNo">230</span> // it), so we can make sure that a
two pass scan will finally find the queue and remove it,<a name="line.230"></a>
-<span class="sourceLineNo">231</span> // unless it has already been removed
by others.<a name="line.231"></a>
+<span class="sourceLineNo">135</span> if
(!isStringEquals(peerConfig.getClusterKey(), oldPeerConfig.getClusterKey()))
{<a name="line.135"></a>
+<span class="sourceLineNo">136</span> throw new DoNotRetryIOException(<a
name="line.136"></a>
+<span class="sourceLineNo">137</span> "Changing the cluster key on an
existing peer is not allowed. Existing key '" +<a name="line.137"></a>
+<span class="sourceLineNo">138</span>
oldPeerConfig.getClusterKey() + "' for peer " + peerId + " does not match new
key '" +<a name="line.138"></a>
+<span class="sourceLineNo">139</span> peerConfig.getClusterKey()
+ "'");<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> if
(!isStringEquals(peerConfig.getReplicationEndpointImpl(),<a name="line.142"></a>
+<span class="sourceLineNo">143</span>
oldPeerConfig.getReplicationEndpointImpl())) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> throw new
DoNotRetryIOException("Changing the replication endpoint implementation class "
+<a name="line.144"></a>
+<span class="sourceLineNo">145</span> "on an existing peer is not
allowed. Existing class '" +<a name="line.145"></a>
+<span class="sourceLineNo">146</span>
oldPeerConfig.getReplicationEndpointImpl() + "' for peer " + peerId +<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> " does not match new class '" +
peerConfig.getReplicationEndpointImpl() + "'");<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> public void addPeer(String peerId,
ReplicationPeerConfig peerConfig, boolean enabled)<a name="line.151"></a>
+<span class="sourceLineNo">152</span> throws ReplicationException {<a
name="line.152"></a>
+<span class="sourceLineNo">153</span> if (peers.containsKey(peerId)) {<a
name="line.153"></a>
+<span class="sourceLineNo">154</span> // this should be a retry, just
return<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> ReplicationPeerConfig
copiedPeerConfig = ReplicationPeerConfig.newBuilder(peerConfig).build();<a
name="line.157"></a>
+<span class="sourceLineNo">158</span> peerStorage.addPeer(peerId,
copiedPeerConfig, enabled);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, copiedPeerConfig));<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> public void removePeer(String peerId)
throws ReplicationException {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> if (!peers.containsKey(peerId)) {<a
name="line.163"></a>
+<span class="sourceLineNo">164</span> // this should be a retry, just
return<a name="line.164"></a>
+<span class="sourceLineNo">165</span> return;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> }<a name="line.166"></a>
+<span class="sourceLineNo">167</span> peerStorage.removePeer(peerId);<a
name="line.167"></a>
+<span class="sourceLineNo">168</span> peers.remove(peerId);<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> private void setPeerState(String
peerId, boolean enabled) throws ReplicationException {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> if (desc.isEnabled() == enabled) {<a
name="line.173"></a>
+<span class="sourceLineNo">174</span> // this should be a retry, just
return<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span> peerStorage.setPeerState(peerId,
enabled);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, desc.getPeerConfig()));<a
name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> public void enablePeer(String peerId)
throws ReplicationException {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> setPeerState(peerId, true);<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 void disablePeer(String peerId)
throws ReplicationException {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> setPeerState(peerId, false);<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> public void updatePeerConfig(String
peerId, ReplicationPeerConfig peerConfig)<a name="line.189"></a>
+<span class="sourceLineNo">190</span> throws ReplicationException {<a
name="line.190"></a>
+<span class="sourceLineNo">191</span> // the checking rules are too
complicated here so we give up checking whether this is a retry.<a
name="line.191"></a>
+<span class="sourceLineNo">192</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> ReplicationPeerConfig oldPeerConfig =
desc.getPeerConfig();<a name="line.193"></a>
+<span class="sourceLineNo">194</span> ReplicationPeerConfigBuilder
newPeerConfigBuilder =<a name="line.194"></a>
+<span class="sourceLineNo">195</span>
ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> // we need to use the new conf to
overwrite the old one.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());<a
name="line.197"></a>
+<span class="sourceLineNo">198</span>
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());<a
name="line.198"></a>
+<span class="sourceLineNo">199</span>
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());<a
name="line.199"></a>
+<span class="sourceLineNo">200</span>
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> ReplicationPeerConfig newPeerConfig =
newPeerConfigBuilder.build();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> peerStorage.updatePeerConfig(peerId,
newPeerConfig);<a name="line.202"></a>
+<span class="sourceLineNo">203</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, desc.isEnabled(), newPeerConfig));<a
name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public
List<ReplicationPeerDescription> listPeers(Pattern pattern) {<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> if (pattern == null) {<a
name="line.207"></a>
+<span class="sourceLineNo">208</span> return new
ArrayList<>(peers.values());<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span> return
peers.values().stream().filter(r ->
pattern.matcher(r.getPeerId()).matches())<a name="line.210"></a>
+<span class="sourceLineNo">211</span> .collect(Collectors.toList());<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> public
Optional<ReplicationPeerConfig> getPeerConfig(String peerId) {<a
name="line.214"></a>
+<span class="sourceLineNo">215</span> ReplicationPeerDescription desc =
peers.get(peerId);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> return desc != null ?
Optional.of(desc.getPeerConfig()) : Optional.empty();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> public void
removeAllQueuesAndHFileRefs(String peerId) throws ReplicationException {<a
name="line.219"></a>
+<span class="sourceLineNo">220</span> // Here we need two passes to address
the problem of claimQueue. Maybe a claimQueue is still<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // on-going when the refresh peer
config procedure is done, if a RS which has already been<a name="line.221"></a>
+<span class="sourceLineNo">222</span> // scanned claims the queue of a RS
which has not been scanned yet, we will miss that queue in<a
name="line.222"></a>
+<span class="sourceLineNo">223</span> // the scan here, and if the RS who
has claimed the queue crashed before creating recovered<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // source, then the queue will leave
there until the another RS detects the crash and helps<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // removing the queue.<a
name="line.225"></a>
+<span class="sourceLineNo">226</span> // A two pass scan can solve the
problem. Anyway, the queue will not disappear during the<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // claiming, it will either under the
old RS or under the new RS, and a queue can only be<a name="line.227"></a>
+<span class="sourceLineNo">228</span> // claimed once after the refresh
peer procedure done(as the next claim queue will just delete<a
name="line.228"></a>
+<span class="sourceLineNo">229</span> // it), so we can make sure that a
two pass scan will finally find the queue and remove it,<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // unless it has already been removed
by others.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>
ReplicationUtils.removeAllQueues(queueStorage, peerId);<a name="line.231"></a>
<span class="sourceLineNo">232</span>
ReplicationUtils.removeAllQueues(queueStorage, peerId);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>
ReplicationUtils.removeAllQueues(queueStorage, peerId);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>
queueStorage.removePeerFromHFileRefs(peerId);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> private void
checkPeerConfig(ReplicationPeerConfig peerConfig) throws DoNotRetryIOException
{<a name="line.237"></a>
-<span class="sourceLineNo">238</span>
checkClusterKey(peerConfig.getClusterKey());<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> if
(peerConfig.replicateAllUserTables()) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> // If replicate_all flag is true,
it means all user tables will be replicated to peer cluster.<a
name="line.241"></a>
-<span class="sourceLineNo">242</span> // Then allow config exclude
namespaces or exclude table-cfs which can't be replicated to peer<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> // cluster.<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if ((peerConfig.getNamespaces() !=
null && !peerConfig.getNamespaces().isEmpty())<a name="line.244"></a>
-<span class="sourceLineNo">245</span> || (peerConfig.getTableCFsMap()
!= null && !peerConfig.getTableCFsMap().isEmpty())) {<a
name="line.245"></a>
-<span class="sourceLineNo">246</span> throw new
DoNotRetryIOException("Need clean namespaces or table-cfs config firstly "<a
name="line.246"></a>
-<span class="sourceLineNo">247</span> + "when you want replicate
all cluster");<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span>
checkNamespacesAndTableCfsConfigConflict(peerConfig.getExcludeNamespaces(),<a
name="line.249"></a>
-<span class="sourceLineNo">250</span>
peerConfig.getExcludeTableCFsMap());<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> // If replicate_all flag is false,
it means all user tables can't be replicated to peer<a name="line.252"></a>
-<span class="sourceLineNo">253</span> // cluster. Then allow to config
namespaces or table-cfs which will be replicated to peer<a name="line.253"></a>
-<span class="sourceLineNo">254</span> // cluster.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> if
((peerConfig.getExcludeNamespaces() != null<a name="line.255"></a>
-<span class="sourceLineNo">256</span> &&
!peerConfig.getExcludeNamespaces().isEmpty())<a name="line.256"></a>
-<span class="sourceLineNo">257</span> ||
(peerConfig.getExcludeTableCFsMap() != null<a name="line.257"></a>
-<span class="sourceLineNo">258</span> &&
!peerConfig.getExcludeTableCFsMap().isEmpty())) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> throw new
DoNotRetryIOException(<a name="line.259"></a>
-<span class="sourceLineNo">260</span> "Need clean
exclude-namespaces or exclude-table-cfs config firstly"<a name="line.260"></a>
-<span class="sourceLineNo">261</span> + " when replicate_all
flag is false");<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span>
checkNamespacesAndTableCfsConfigConflict(peerConfig.getNamespaces(),<a
name="line.263"></a>
-<span class="sourceLineNo">264</span> peerConfig.getTableCFsMap());<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>
checkConfiguredWALEntryFilters(peerConfig);<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> /**<a name="line.270"></a>
-<span class="sourceLineNo">271</span> * Set a namespace in the peer config
means that all tables in this namespace will be replicated<a
name="line.271"></a>
-<span class="sourceLineNo">272</span> * to the peer cluster.<a
name="line.272"></a>
-<span class="sourceLineNo">273</span> * <ol><a name="line.273"></a>
-<span class="sourceLineNo">274</span> * <li>If peer config already has
a namespace, then not allow set any table of this namespace to<a
name="line.274"></a>
-<span class="sourceLineNo">275</span> * the peer config.</li><a
name="line.275"></a>
-<span class="sourceLineNo">276</span> * <li>If peer config already has
a table, then not allow set this table's namespace to the peer<a
name="line.276"></a>
-<span class="sourceLineNo">277</span> * config.</li><a
name="line.277"></a>
-<span class="sourceLineNo">278</span> * </ol><a name="line.278"></a>
-<span class="sourceLineNo">279</span> * <p><a name="line.279"></a>
-<span class="sourceLineNo">280</span> * Set a exclude namespace in the peer
config means that all tables in this namespace can't be<a name="line.280"></a>
-<span class="sourceLineNo">281</span> * replicated to the peer cluster.<a
name="line.281"></a>
-<span class="sourceLineNo">282</span> * <ol><a name="line.282"></a>
-<span class="sourceLineNo">283</span> * <li>If peer config already has
a exclude namespace, then not allow set any exclude table of<a
name="line.283"></a>
-<span class="sourceLineNo">284</span> * this namespace to the peer
config.</li><a name="line.284"></a>
-<span class="sourceLineNo">285</span> * <li>If peer config already has
a exclude table, then not allow set this table's namespace as a<a
name="line.285"></a>
-<span class="sourceLineNo">286</span> * exclude namespace.</li><a
name="line.286"></a>
-<span class="sourceLineNo">287</span> * </ol><a name="line.287"></a>
-<span class="sourceLineNo">288</span> */<a name="line.288"></a>
-<span class="sourceLineNo">289</span> private void
checkNamespacesAndTableCfsConfigConflict(Set<String> namespaces,<a
name="line.289"></a>
-<span class="sourceLineNo">290</span> Map<TableName, ? extends
Collection<String>> tableCfs) throws DoNotRetryIOException {<a
name="line.290"></a>
-<span class="sourceLineNo">291</span> if (namespaces == null ||
namespaces.isEmpty()) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> }<a name="line.293"></a>
-<span class="sourceLineNo">294</span> if (tableCfs == null ||
tableCfs.isEmpty()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> return;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> }<a name="line.296"></a>
-<span class="sourceLineNo">297</span> for (Map.Entry<TableName, ?
extends Collection<String>> entry : tableCfs.entrySet()) {<a
name="line.297"></a>
-<span class="sourceLineNo">298</span> TableName table = entry.getKey();<a
name="line.298"></a>
-<span class="sourceLineNo">299</span> if
(namespaces.contains(table.getNamespaceAsString())) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> throw new
DoNotRetryIOException("Table-cfs " + table + " is conflict with namespaces "
+<a name="line.300"></a>
-<span class="sourceLineNo">301</span> table.getNamespaceAsString() +
" in peer config");<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> private void
checkConfiguredWALEntryFilters(ReplicationPeerConfig peerConfig)<a
name="line.306"></a>
-<span class="sourceLineNo">307</span> throws DoNotRetryIOException {<a
name="line.307"></a>
-<span class="sourceLineNo">308</span> String filterCSV =
peerConfig.getConfiguration()<a name="line.308"></a>
-<span class="sourceLineNo">309</span>
.get(BaseReplicationEndpoint.REPLICATION_WALENTRYFILTER_CONFIG_KEY);<a
name="line.309"></a>
-<span class="sourceLineNo">310</span> if (filterCSV != null &&
!filterCSV.isEmpty()) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> String[] filters =
filterCSV.split(",");<a name="line.311"></a>
-<span class="sourceLineNo">312</span> for (String filter : filters) {<a
name="line.312"></a>
-<span class="sourceLineNo">313</span> try {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>
Class.forName(filter).newInstance();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> } catch (Exception e) {<a
name="line.315"></a>
-<span class="sourceLineNo">316</span> throw new
DoNotRetryIOException("Configured WALEntryFilter " + filter +<a
name="line.316"></a>
-<span class="sourceLineNo">317</span> " could not be created.
Failing add/update " + "peer operation.", e);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<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> private void checkClusterKey(String
clusterKey) throws DoNotRetryIOException {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>
ZKConfig.validateClusterKey(clusterKey);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } catch (IOException e) {<a
name="line.326"></a>
-<span class="sourceLineNo">327</span> throw new
DoNotRetryIOException("Invalid cluster key: " + clusterKey, e);<a
name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span> public static ReplicationPeerManager
create(ZKWatcher zk, Configuration conf)<a name="line.331"></a>
-<span class="sourceLineNo">332</span> throws ReplicationException {<a
name="line.332"></a>
-<span class="sourceLineNo">333</span> ReplicationPeerStorage peerStorage
=<a name="line.333"></a>
-<span class="sourceLineNo">334</span>
ReplicationStorageFactory.getReplicationPeerStorage(zk, conf);<a
name="line.334"></a>
-<span class="sourceLineNo">335</span> ConcurrentMap<String,
ReplicationPeerDescription> peers = new ConcurrentHashMap<>();<a
name="line.335"></a>
-<span class="sourceLineNo">336</span> for (String peerId :
peerStorage.listPeerIds()) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> ReplicationPeerConfig peerConfig =
peerStorage.getPeerConfig(peerId);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> boolean enabled =
peerStorage.isPeerEnabled(peerId);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, peerConfig));<a name="line.339"></a>
-<span class="sourceLineNo">340</span> }<a name="line.340"></a>
-<span class="sourceLineNo">341</span> return new
ReplicationPeerManager(peerStorage,<a name="line.341"></a>
-<span class="sourceLineNo">342</span>
ReplicationStorageFactory.getReplicationQueueStorage(zk, conf), peers);<a
name="line.342"></a>
-<span class="sourceLineNo">343</span> }<a name="line.343"></a>
-<span class="sourceLineNo">344</span>}<a name="line.344"></a>
+<span class="sourceLineNo">233</span>
queueStorage.removePeerFromHFileRefs(peerId);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span><a name="line.235"></a>
+<span class="sourceLineNo">236</span> private void
checkPeerConfig(ReplicationPeerConfig peerConfig) throws DoNotRetryIOException
{<a name="line.236"></a>
+<span class="sourceLineNo">237</span>
checkClusterKey(peerConfig.getClusterKey());<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> if
(peerConfig.replicateAllUserTables()) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> // If replicate_all flag is true,
it means all user tables will be replicated to peer cluster.<a
name="line.240"></a>
+<span class="sourceLineNo">241</span> // Then allow config exclude
namespaces or exclude table-cfs which can't be replicated to peer<a
name="line.241"></a>
+<span class="sourceLineNo">242</span> // cluster.<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if ((peerConfig.getNamespaces() !=
null && !peerConfig.getNamespaces().isEmpty())<a name="line.243"></a>
+<span class="sourceLineNo">244</span> || (peerConfig.getTableCFsMap()
!= null && !peerConfig.getTableCFsMap().isEmpty())) {<a
name="line.244"></a>
+<span class="sourceLineNo">245</span> throw new
DoNotRetryIOException("Need clean namespaces or table-cfs config firstly "<a
name="line.245"></a>
+<span class="sourceLineNo">246</span> + "when you want replicate
all cluster");<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>
checkNamespacesAndTableCfsConfigConflict(peerConfig.getExcludeNamespaces(),<a
name="line.248"></a>
+<span class="sourceLineNo">249</span>
peerConfig.getExcludeTableCFsMap());<a name="line.249"></a>
+<span class="sourceLineNo">250</span> } else {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> // If replicate_all flag is false,
it means all user tables can't be replicated to peer<a name="line.251"></a>
+<span class="sourceLineNo">252</span> // cluster. Then allow to config
namespaces or table-cfs which will be replicated to peer<a name="line.252"></a>
+<span class="sourceLineNo">253</span> // cluster.<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if
((peerConfig.getExcludeNamespaces() != null<a name="line.254"></a>
+<span class="sourceLineNo">255</span> &&
!peerConfig.getExcludeNamespaces().isEmpty())<a name="line.255"></a>
+<span class="sourceLineNo">256</span> ||
(peerConfig.getExcludeTableCFsMap() != null<a name="line.256"></a>
+<span class="sourceLineNo">257</span> &&
!peerConfig.getExcludeTableCFsMap().isEmpty())) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> throw new
DoNotRetryIOException(<a name="line.258"></a>
+<span class="sourceLineNo">259</span> "Need clean
exclude-namespaces or exclude-table-cfs config firstly"<a name="line.259"></a>
+<span class="sourceLineNo">260</span> + " when replicate_all
flag is false");<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span>
checkNamespacesAndTableCfsConfigConflict(peerConfig.getNamespaces(),<a
name="line.262"></a>
+<span class="sourceLineNo">263</span> peerConfig.getTableCFsMap());<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>
checkConfiguredWALEntryFilters(peerConfig);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span> /**<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * Set a namespace in the peer config
means that all tables in this namespace will be replicated<a
name="line.270"></a>
+<span class="sourceLineNo">271</span> * to the peer cluster.<a
name="line.271"></a>
+<span class="sourceLineNo">272</span> * <ol><a name="line.272"></a>
+<span class="sourceLineNo">273</span> * <li>If peer config already has
a namespace, then not allow set any table of this namespace to<a
name="line.273"></a>
+<span class="sourceLineNo">274</span> * the peer config.</li><a
name="line.274"></a>
+<span class="sourceLineNo">275</span> * <li>If peer config already has
a table, then not allow set this table's namespace to the peer<a
name="line.275"></a>
+<span class="sourceLineNo">276</span> * config.</li><a
name="line.276"></a>
+<span class="sourceLineNo">277</span> * </ol><a name="line.277"></a>
+<span class="sourceLineNo">278</span> * <p><a name="line.278"></a>
+<span class="sourceLineNo">279</span> * Set a exclude namespace in the peer
config means that all tables in this namespace can't be<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * replicated to the peer cluster.<a
name="line.280"></a>
+<span class="sourceLineNo">281</span> * <ol><a name="line.281"></a>
+<span class="sourceLineNo">282</span> * <li>If peer config already has
a exclude namespace, then not allow set any exclude table of<a
name="line.282"></a>
+<span class="sourceLineNo">283</span> * this namespace to the peer
config.</li><a name="line.283"></a>
+<span class="sourceLineNo">284</span> * <li>If peer config already has
a exclude table, then not allow set this table's namespace as a<a
name="line.284"></a>
+<span class="sourceLineNo">285</span> * exclude namespace.</li><a
name="line.285"></a>
+<span class="sourceLineNo">286</span> * </ol><a name="line.286"></a>
+<span class="sourceLineNo">287</span> */<a name="line.287"></a>
+<span class="sourceLineNo">288</span> private void
checkNamespacesAndTableCfsConfigConflict(Set<String> namespaces,<a
name="line.288"></a>
+<span class="sourceLineNo">289</span> Map<TableName, ? extends
Collection<String>> tableCfs) throws DoNotRetryIOException {<a
name="line.289"></a>
+<span class="sourceLineNo">290</span> if (namespaces == null ||
namespaces.isEmpty()) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (tableCfs == null ||
tableCfs.isEmpty()) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> return;<a name="line.294"></a>
+<span class="sourceLineNo">295</span> }<a name="line.295"></a>
+<span class="sourceLineNo">296</span> for (Map.Entry<TableName, ?
extends Collection<String>> entry : tableCfs.entrySet()) {<a
name="line.296"></a>
+<span class="sourceLineNo">297</span> TableName table = entry.getKey();<a
name="line.297"></a>
+<span class="sourceLineNo">298</span> if
(namespaces.contains(table.getNamespaceAsString())) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> throw new
DoNotRetryIOException("Table-cfs " + table + " is conflict with namespaces "
+<a name="line.299"></a>
+<span class="sourceLineNo">300</span> table.getNamespaceAsString() +
" in peer config");<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><a name="line.304"></a>
+<span class="sourceLineNo">305</span> private void
checkConfiguredWALEntryFilters(ReplicationPeerConfig peerConfig)<a
name="line.305"></a>
+<span class="sourceLineNo">306</span> throws DoNotRetryIOException {<a
name="line.306"></a>
+<span class="sourceLineNo">307</span> String filterCSV =
peerConfig.getConfiguration()<a name="line.307"></a>
+<span class="sourceLineNo">308</span>
.get(BaseReplicationEndpoint.REPLICATION_WALENTRYFILTER_CONFIG_KEY);<a
name="line.308"></a>
+<span class="sourceLineNo">309</span> if (filterCSV != null &&
!filterCSV.isEmpty()) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> String[] filters =
filterCSV.split(",");<a name="line.310"></a>
+<span class="sourceLineNo">311</span> for (String filter : filters) {<a
name="line.311"></a>
+<span class="sourceLineNo">312</span> try {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>
Class.forName(filter).newInstance();<a name="line.313"></a>
+<span class="sourceLineNo">314</span> } catch (Exception e) {<a
name="line.314"></a>
+<span class="sourceLineNo">315</span> throw new
DoNotRetryIOException("Configured WALEntryFilter " + filter +<a
name="line.315"></a>
+<span class="sourceLineNo">316</span> " could not be created.
Failing add/update " + "peer operation.", e);<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> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> private void checkClusterKey(String
clusterKey) throws DoNotRetryIOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> try {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>
ZKConfig.validateClusterKey(clusterKey);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> } catch (IOException e) {<a
name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new
DoNotRetryIOException("Invalid cluster key: " + clusterKey, e);<a
name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span> }<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> public static ReplicationPeerManager
create(ZKWatcher zk, Configuration conf)<a name="line.330"></a>
+<span class="sourceLineNo">331</span> throws ReplicationException {<a
name="line.331"></a>
+<span class="sourceLineNo">332</span> ReplicationPeerStorage peerStorage
=<a name="line.332"></a>
+<span class="sourceLineNo">333</span>
ReplicationStorageFactory.getReplicationPeerStorage(zk, conf);<a
name="line.333"></a>
+<span class="sourceLineNo">334</span> ConcurrentMap<String,
ReplicationPeerDescription> peers = new ConcurrentHashMap<>();<a
name="line.334"></a>
+<span class="sourceLineNo">335</span> for (String peerId :
peerStorage.listPeerIds()) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> ReplicationPeerConfig peerConfig =
peerStorage.getPeerConfig(peerId);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> boolean enabled =
peerStorage.isPeerEnabled(peerId);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> peers.put(peerId, new
ReplicationPeerDescription(peerId, enabled, peerConfig));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> return new
ReplicationPeerManager(peerStorage,<a name="line.340"></a>
+<span class="sourceLineNo">341</span>
ReplicationStorageFactory.getReplicationQueueStorage(zk, conf), peers);<a
name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span> /**<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * For replication peer cluster key or
endpoint class, null and empty string is same. So here<a name="line.345"></a>
+<span class="sourceLineNo">346</span> * don't use {@link
StringUtils#equals(CharSequence, CharSequence)} directly.<a name="line.346"></a>
+<span class="sourceLineNo">347</span> */<a name="line.347"></a>
+<span class="sourceLineNo">348</span> private boolean isStringEquals(String
s1, String s2) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> if (StringUtils.isBlank(s1)) {<a
name="line.349"></a>
+<span class="sourceLineNo">350</span> return StringUtils.isBlank(s2);<a
name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span> return s1.equals(s2);<a
name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span>}<a name="line.354"></a>
