You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/03/10 14:54:18 UTC
[15/43] hbase-site git commit: Published site at
45bbee4905fb031259c935502444c729b32ddac8.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/854846a5/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
index e2816cd..21374e6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationPeerConfigUtil.html
@@ -311,218 +311,223 @@
<span class="sourceLineNo">303</span> builder.setReplicateAllUserTables(peer.getReplicateAll());<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> Map<TableName, List<String>> excludeTableCFsMap = convert2Map(peer.getExcludeTableCfsList()<a name="line.306"></a>
-<span class="sourceLineNo">307</span> .toArray(new ReplicationProtos.TableCF[peer.getExcludeTableCfsCount()]));<a name="line.307"></a>
-<span class="sourceLineNo">308</span> if (excludeTableCFsMap != null) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> builder.setExcludeTableCFsMap(excludeTableCFsMap);<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> List<ByteString> excludeNamespacesList = peer.getExcludeNamespacesList();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> if (excludeNamespacesList != null && excludeNamespacesList.size() != 0) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span> builder.setExcludeNamespaces(<a name="line.314"></a>
-<span class="sourceLineNo">315</span> excludeNamespacesList.stream().map(ByteString::toStringUtf8).collect(Collectors.toSet()));<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> return builder.build();<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> public static ReplicationProtos.ReplicationPeer convert(ReplicationPeerConfig peerConfig) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> ReplicationProtos.ReplicationPeer.Builder builder =<a name="line.322"></a>
-<span class="sourceLineNo">323</span> ReplicationProtos.ReplicationPeer.newBuilder();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (peerConfig.getClusterKey() != null) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> builder.setClusterkey(peerConfig.getClusterKey());<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span> if (peerConfig.getReplicationEndpointImpl() != null) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> builder.setReplicationEndpointImpl(peerConfig.getReplicationEndpointImpl());<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> for (Map.Entry<byte[], byte[]> entry : peerConfig.getPeerData().entrySet()) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> builder.addData(HBaseProtos.BytesBytesPair.newBuilder()<a name="line.332"></a>
-<span class="sourceLineNo">333</span> .setFirst(UnsafeByteOperations.unsafeWrap(entry.getKey()))<a name="line.333"></a>
-<span class="sourceLineNo">334</span> .setSecond(UnsafeByteOperations.unsafeWrap(entry.getValue()))<a name="line.334"></a>
-<span class="sourceLineNo">335</span> .build());<a name="line.335"></a>
-<span class="sourceLineNo">336</span> }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> for (Map.Entry<String, String> entry : peerConfig.getConfiguration().entrySet()) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> builder.addConfiguration(HBaseProtos.NameStringPair.newBuilder()<a name="line.339"></a>
-<span class="sourceLineNo">340</span> .setName(entry.getKey())<a name="line.340"></a>
-<span class="sourceLineNo">341</span> .setValue(entry.getValue())<a name="line.341"></a>
-<span class="sourceLineNo">342</span> .build());<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> ReplicationProtos.TableCF[] tableCFs = convert(peerConfig.getTableCFsMap());<a name="line.345"></a>
-<span class="sourceLineNo">346</span> if (tableCFs != null) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> for (int i = 0; i < tableCFs.length; i++) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> builder.addTableCfs(tableCFs[i]);<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> Set<String> namespaces = peerConfig.getNamespaces();<a name="line.351"></a>
-<span class="sourceLineNo">352</span> if (namespaces != null) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> for (String namespace : namespaces) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> builder.addNamespaces(ByteString.copyFromUtf8(namespace));<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> builder.setBandwidth(peerConfig.getBandwidth());<a name="line.358"></a>
-<span class="sourceLineNo">359</span> builder.setReplicateAll(peerConfig.replicateAllUserTables());<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> ReplicationProtos.TableCF[] excludeTableCFs = convert(peerConfig.getExcludeTableCFsMap());<a name="line.361"></a>
-<span class="sourceLineNo">362</span> if (excludeTableCFs != null) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> for (int i = 0; i < excludeTableCFs.length; i++) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> builder.addExcludeTableCfs(excludeTableCFs[i]);<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> Set<String> excludeNamespaces = peerConfig.getExcludeNamespaces();<a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (excludeNamespaces != null) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> for (String namespace : excludeNamespaces) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> builder.addExcludeNamespaces(ByteString.copyFromUtf8(namespace));<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> return builder.build();<a name="line.374"></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> /**<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * @param peerConfig<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * @return Serialized protobuf of <code>peerConfig</code> with pb magic prefix prepended suitable<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * for use as content of a this.peersZNode; i.e. the content of PEER_ID znode under<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * /hbase/replication/peers/PEER_ID<a name="line.381"></a>
-<span class="sourceLineNo">382</span> */<a name="line.382"></a>
-<span class="sourceLineNo">383</span> public static byte[] toByteArray(final ReplicationPeerConfig peerConfig) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> byte[] bytes = convert(peerConfig).toByteArray();<a name="line.384"></a>
-<span class="sourceLineNo">385</span> return ProtobufUtil.prependPBMagic(bytes);<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>
-<span class="sourceLineNo">388</span> public static ReplicationPeerDescription toReplicationPeerDescription(<a name="line.388"></a>
-<span class="sourceLineNo">389</span> ReplicationProtos.ReplicationPeerDescription desc) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> boolean enabled = ReplicationProtos.ReplicationState.State.ENABLED == desc.getState()<a name="line.390"></a>
-<span class="sourceLineNo">391</span> .getState();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> ReplicationPeerConfig config = convert(desc.getConfig());<a name="line.392"></a>
-<span class="sourceLineNo">393</span> return new ReplicationPeerDescription(desc.getId(), enabled, config);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span> public static ReplicationProtos.ReplicationPeerDescription toProtoReplicationPeerDescription(<a name="line.396"></a>
-<span class="sourceLineNo">397</span> ReplicationPeerDescription desc) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> ReplicationProtos.ReplicationPeerDescription.Builder builder =<a name="line.398"></a>
-<span class="sourceLineNo">399</span> ReplicationProtos.ReplicationPeerDescription.newBuilder();<a name="line.399"></a>
-<span class="sourceLineNo">400</span> builder.setId(desc.getPeerId());<a name="line.400"></a>
-<span class="sourceLineNo">401</span> ReplicationProtos.ReplicationState.Builder stateBuilder = ReplicationProtos.ReplicationState<a name="line.401"></a>
-<span class="sourceLineNo">402</span> .newBuilder();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> stateBuilder.setState(desc.isEnabled() ? ReplicationProtos.ReplicationState.State.ENABLED<a name="line.403"></a>
-<span class="sourceLineNo">404</span> : ReplicationProtos.ReplicationState.State.DISABLED);<a name="line.404"></a>
-<span class="sourceLineNo">405</span> builder.setState(stateBuilder.build());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> builder.setConfig(convert(desc.getPeerConfig()));<a name="line.406"></a>
-<span class="sourceLineNo">407</span> return builder.build();<a name="line.407"></a>
-<span class="sourceLineNo">408</span> }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> public static ReplicationPeerConfig appendTableCFsToReplicationPeerConfig(<a name="line.410"></a>
-<span class="sourceLineNo">411</span> Map<TableName, List<String>> tableCfs, ReplicationPeerConfig peerConfig) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> Map<TableName, List<String>> preTableCfs = peerConfig.getTableCFsMap();<a name="line.413"></a>
-<span class="sourceLineNo">414</span> if (preTableCfs == null) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span> builder.setTableCFsMap(tableCfs);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } else {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> Map<TableName, List<String>> newTableCfs = copyTableCFsMap(preTableCfs);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> for (Map.Entry<TableName, ? extends Collection<String>> entry : tableCfs.entrySet()) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> TableName table = entry.getKey();<a name="line.419"></a>
-<span class="sourceLineNo">420</span> Collection<String> appendCfs = entry.getValue();<a name="line.420"></a>
-<span class="sourceLineNo">421</span> if (newTableCfs.containsKey(table)) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> List<String> cfs = newTableCfs.get(table);<a name="line.422"></a>
-<span class="sourceLineNo">423</span> if (cfs == null || appendCfs == null || appendCfs.isEmpty()) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> newTableCfs.put(table, null);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> } else {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> Set<String> cfSet = new HashSet<String>(cfs);<a name="line.426"></a>
-<span class="sourceLineNo">427</span> cfSet.addAll(appendCfs);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> newTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
-<span class="sourceLineNo">430</span> } else {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> if (appendCfs == null || appendCfs.isEmpty()) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span> newTableCfs.put(table, null);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } else {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> newTableCfs.put(table, Lists.newArrayList(appendCfs));<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span> }<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span> builder.setTableCFsMap(newTableCfs);<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> return builder.build();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private static Map<TableName, List<String>><a name="line.443"></a>
-<span class="sourceLineNo">444</span> copyTableCFsMap(Map<TableName, List<String>> preTableCfs) {<a name="line.444"></a>
-<span class="sourceLineNo">445</span> Map<TableName, List<String>> newTableCfs = new HashMap<>();<a name="line.445"></a>
-<span class="sourceLineNo">446</span> preTableCfs.forEach(<a name="line.446"></a>
-<span class="sourceLineNo">447</span> (table, cfs) -> newTableCfs.put(table, cfs != null ? Lists.newArrayList(cfs) : null));<a name="line.447"></a>
-<span class="sourceLineNo">448</span> return newTableCfs;<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> public static ReplicationPeerConfig removeTableCFsFromReplicationPeerConfig(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> Map<TableName, List<String>> tableCfs, ReplicationPeerConfig peerConfig,<a name="line.452"></a>
-<span class="sourceLineNo">453</span> String id) throws ReplicationException {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> Map<TableName, List<String>> preTableCfs = peerConfig.getTableCFsMap();<a name="line.454"></a>
-<span class="sourceLineNo">455</span> if (preTableCfs == null) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> throw new ReplicationException("Table-Cfs for peer: " + id + " is null");<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> Map<TableName, List<String>> newTableCfs = copyTableCFsMap(preTableCfs);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> for (Map.Entry<TableName, ? extends Collection<String>> entry : tableCfs.entrySet()) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> TableName table = entry.getKey();<a name="line.460"></a>
-<span class="sourceLineNo">461</span> Collection<String> removeCfs = entry.getValue();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> if (newTableCfs.containsKey(table)) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> List<String> cfs = newTableCfs.get(table);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> if (cfs == null && (removeCfs == null || removeCfs.isEmpty())) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> newTableCfs.remove(table);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> } else if (cfs != null && (removeCfs != null && !removeCfs.isEmpty())) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> Set<String> cfSet = new HashSet<String>(cfs);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> cfSet.removeAll(removeCfs);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (cfSet.isEmpty()) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> newTableCfs.remove(table);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> } else {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> newTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span> } else if (cfs == null && (removeCfs != null && !removeCfs.isEmpty())) {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> throw new ReplicationException("Cannot remove cf of table: " + table<a name="line.475"></a>
-<span class="sourceLineNo">476</span> + " which doesn't specify cfs from table-cfs config in peer: " + id);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> } else if (cfs != null && (removeCfs == null || removeCfs.isEmpty())) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span> throw new ReplicationException("Cannot remove table: " + table<a name="line.478"></a>
-<span class="sourceLineNo">479</span> + " which has specified cfs from table-cfs config in peer: " + id);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> } else {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> throw new ReplicationException(<a name="line.482"></a>
-<span class="sourceLineNo">483</span> "No table: " + table + " in table-cfs config of peer: " + id);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> }<a name="line.485"></a>
-<span class="sourceLineNo">486</span> ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> builder.setTableCFsMap(newTableCfs);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> return builder.build();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> /**<a name="line.491"></a>
-<span class="sourceLineNo">492</span> * Returns the configuration needed to talk to the remote slave cluster.<a name="line.492"></a>
-<span class="sourceLineNo">493</span> * @param conf the base configuration<a name="line.493"></a>
-<span class="sourceLineNo">494</span> * @param peer the description of replication peer<a name="line.494"></a>
-<span class="sourceLineNo">495</span> * @return the configuration for the peer cluster, null if it was unable to get the configuration<a name="line.495"></a>
-<span class="sourceLineNo">496</span> * @throws IOException when create peer cluster configuration failed<a name="line.496"></a>
-<span class="sourceLineNo">497</span> */<a name="line.497"></a>
-<span class="sourceLineNo">498</span> public static Configuration getPeerClusterConfiguration(Configuration conf,<a name="line.498"></a>
-<span class="sourceLineNo">499</span> ReplicationPeerDescription peer) throws IOException {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> ReplicationPeerConfig peerConfig = peer.getPeerConfig();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> Configuration otherConf;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> try {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> otherConf = HBaseConfiguration.createClusterConf(conf, peerConfig.getClusterKey());<a name="line.503"></a>
-<span class="sourceLineNo">504</span> } catch (IOException e) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> throw new IOException("Can't get peer configuration for peerId=" + peer.getPeerId(), e);<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> if (!peerConfig.getConfiguration().isEmpty()) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> CompoundConfiguration compound = new CompoundConfiguration();<a name="line.509"></a>
-<span class="sourceLineNo">510</span> compound.add(otherConf);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> compound.addStringMap(peerConfig.getConfiguration());<a name="line.511"></a>
-<span class="sourceLineNo">512</span> return compound;<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span> return otherConf;<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span>}<a name="line.517"></a>
+<span class="sourceLineNo">306</span> if (peer.hasSerial()) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> builder.setSerial(peer.getSerial());<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> Map<TableName, List<String>> excludeTableCFsMap = convert2Map(peer.getExcludeTableCfsList()<a name="line.310"></a>
+<span class="sourceLineNo">311</span> .toArray(new ReplicationProtos.TableCF[peer.getExcludeTableCfsCount()]));<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (excludeTableCFsMap != null) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> builder.setExcludeTableCFsMap(excludeTableCFsMap);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> List<ByteString> excludeNamespacesList = peer.getExcludeNamespacesList();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (excludeNamespacesList != null && excludeNamespacesList.size() != 0) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> builder.setExcludeNamespaces(<a name="line.318"></a>
+<span class="sourceLineNo">319</span> excludeNamespacesList.stream().map(ByteString::toStringUtf8).collect(Collectors.toSet()));<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> return builder.build();<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> public static ReplicationProtos.ReplicationPeer convert(ReplicationPeerConfig peerConfig) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> ReplicationProtos.ReplicationPeer.Builder builder =<a name="line.326"></a>
+<span class="sourceLineNo">327</span> ReplicationProtos.ReplicationPeer.newBuilder();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> if (peerConfig.getClusterKey() != null) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> builder.setClusterkey(peerConfig.getClusterKey());<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span> if (peerConfig.getReplicationEndpointImpl() != null) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> builder.setReplicationEndpointImpl(peerConfig.getReplicationEndpointImpl());<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> for (Map.Entry<byte[], byte[]> entry : peerConfig.getPeerData().entrySet()) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> builder.addData(HBaseProtos.BytesBytesPair.newBuilder()<a name="line.336"></a>
+<span class="sourceLineNo">337</span> .setFirst(UnsafeByteOperations.unsafeWrap(entry.getKey()))<a name="line.337"></a>
+<span class="sourceLineNo">338</span> .setSecond(UnsafeByteOperations.unsafeWrap(entry.getValue()))<a name="line.338"></a>
+<span class="sourceLineNo">339</span> .build());<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> for (Map.Entry<String, String> entry : peerConfig.getConfiguration().entrySet()) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> builder.addConfiguration(HBaseProtos.NameStringPair.newBuilder()<a name="line.343"></a>
+<span class="sourceLineNo">344</span> .setName(entry.getKey())<a name="line.344"></a>
+<span class="sourceLineNo">345</span> .setValue(entry.getValue())<a name="line.345"></a>
+<span class="sourceLineNo">346</span> .build());<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> ReplicationProtos.TableCF[] tableCFs = convert(peerConfig.getTableCFsMap());<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (tableCFs != null) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> for (int i = 0; i < tableCFs.length; i++) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> builder.addTableCfs(tableCFs[i]);<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>
+<span class="sourceLineNo">355</span> Set<String> namespaces = peerConfig.getNamespaces();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> if (namespaces != null) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> for (String namespace : namespaces) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> builder.addNamespaces(ByteString.copyFromUtf8(namespace));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> builder.setBandwidth(peerConfig.getBandwidth());<a name="line.362"></a>
+<span class="sourceLineNo">363</span> builder.setReplicateAll(peerConfig.replicateAllUserTables());<a name="line.363"></a>
+<span class="sourceLineNo">364</span> builder.setSerial(peerConfig.isSerial());<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> ReplicationProtos.TableCF[] excludeTableCFs = convert(peerConfig.getExcludeTableCFsMap());<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (excludeTableCFs != null) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> for (int i = 0; i < excludeTableCFs.length; i++) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> builder.addExcludeTableCfs(excludeTableCFs[i]);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span> }<a name="line.371"></a>
+<span class="sourceLineNo">372</span> Set<String> excludeNamespaces = peerConfig.getExcludeNamespaces();<a name="line.372"></a>
+<span class="sourceLineNo">373</span> if (excludeNamespaces != null) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> for (String namespace : excludeNamespaces) {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> builder.addExcludeNamespaces(ByteString.copyFromUtf8(namespace));<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span> }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> return builder.build();<a name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * @param peerConfig<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @return Serialized protobuf of <code>peerConfig</code> with pb magic prefix prepended suitable<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * for use as content of a this.peersZNode; i.e. the content of PEER_ID znode under<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * /hbase/replication/peers/PEER_ID<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> public static byte[] toByteArray(final ReplicationPeerConfig peerConfig) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> byte[] bytes = convert(peerConfig).toByteArray();<a name="line.389"></a>
+<span class="sourceLineNo">390</span> return ProtobufUtil.prependPBMagic(bytes);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> }<a name="line.391"></a>
+<span class="sourceLineNo">392</span><a name="line.392"></a>
+<span class="sourceLineNo">393</span> public static ReplicationPeerDescription toReplicationPeerDescription(<a name="line.393"></a>
+<span class="sourceLineNo">394</span> ReplicationProtos.ReplicationPeerDescription desc) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> boolean enabled = ReplicationProtos.ReplicationState.State.ENABLED == desc.getState()<a name="line.395"></a>
+<span class="sourceLineNo">396</span> .getState();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> ReplicationPeerConfig config = convert(desc.getConfig());<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return new ReplicationPeerDescription(desc.getId(), enabled, config);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> public static ReplicationProtos.ReplicationPeerDescription toProtoReplicationPeerDescription(<a name="line.401"></a>
+<span class="sourceLineNo">402</span> ReplicationPeerDescription desc) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> ReplicationProtos.ReplicationPeerDescription.Builder builder =<a name="line.403"></a>
+<span class="sourceLineNo">404</span> ReplicationProtos.ReplicationPeerDescription.newBuilder();<a name="line.404"></a>
+<span class="sourceLineNo">405</span> builder.setId(desc.getPeerId());<a name="line.405"></a>
+<span class="sourceLineNo">406</span> ReplicationProtos.ReplicationState.Builder stateBuilder = ReplicationProtos.ReplicationState<a name="line.406"></a>
+<span class="sourceLineNo">407</span> .newBuilder();<a name="line.407"></a>
+<span class="sourceLineNo">408</span> stateBuilder.setState(desc.isEnabled() ? ReplicationProtos.ReplicationState.State.ENABLED<a name="line.408"></a>
+<span class="sourceLineNo">409</span> : ReplicationProtos.ReplicationState.State.DISABLED);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> builder.setState(stateBuilder.build());<a name="line.410"></a>
+<span class="sourceLineNo">411</span> builder.setConfig(convert(desc.getPeerConfig()));<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return builder.build();<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> public static ReplicationPeerConfig appendTableCFsToReplicationPeerConfig(<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Map<TableName, List<String>> tableCfs, ReplicationPeerConfig peerConfig) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> Map<TableName, List<String>> preTableCfs = peerConfig.getTableCFsMap();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> if (preTableCfs == null) {<a name="line.419"></a>
+<span class="sourceLineNo">420</span> builder.setTableCFsMap(tableCfs);<a name="line.420"></a>
+<span class="sourceLineNo">421</span> } else {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> Map<TableName, List<String>> newTableCfs = copyTableCFsMap(preTableCfs);<a name="line.422"></a>
+<span class="sourceLineNo">423</span> for (Map.Entry<TableName, ? extends Collection<String>> entry : tableCfs.entrySet()) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> TableName table = entry.getKey();<a name="line.424"></a>
+<span class="sourceLineNo">425</span> Collection<String> appendCfs = entry.getValue();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (newTableCfs.containsKey(table)) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> List<String> cfs = newTableCfs.get(table);<a name="line.427"></a>
+<span class="sourceLineNo">428</span> if (cfs == null || appendCfs == null || appendCfs.isEmpty()) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span> newTableCfs.put(table, null);<a name="line.429"></a>
+<span class="sourceLineNo">430</span> } else {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> Set<String> cfSet = new HashSet<String>(cfs);<a name="line.431"></a>
+<span class="sourceLineNo">432</span> cfSet.addAll(appendCfs);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> newTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> } else {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> if (appendCfs == null || appendCfs.isEmpty()) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> newTableCfs.put(table, null);<a name="line.437"></a>
+<span class="sourceLineNo">438</span> } else {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> newTableCfs.put(table, Lists.newArrayList(appendCfs));<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span> builder.setTableCFsMap(newTableCfs);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span> return builder.build();<a name="line.445"></a>
+<span class="sourceLineNo">446</span> }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span> private static Map<TableName, List<String>><a name="line.448"></a>
+<span class="sourceLineNo">449</span> copyTableCFsMap(Map<TableName, List<String>> preTableCfs) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> Map<TableName, List<String>> newTableCfs = new HashMap<>();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> preTableCfs.forEach(<a name="line.451"></a>
+<span class="sourceLineNo">452</span> (table, cfs) -> newTableCfs.put(table, cfs != null ? Lists.newArrayList(cfs) : null));<a name="line.452"></a>
+<span class="sourceLineNo">453</span> return newTableCfs;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> public static ReplicationPeerConfig removeTableCFsFromReplicationPeerConfig(<a name="line.456"></a>
+<span class="sourceLineNo">457</span> Map<TableName, List<String>> tableCfs, ReplicationPeerConfig peerConfig,<a name="line.457"></a>
+<span class="sourceLineNo">458</span> String id) throws ReplicationException {<a name="line.458"></a>
+<span class="sourceLineNo">459</span> Map<TableName, List<String>> preTableCfs = peerConfig.getTableCFsMap();<a name="line.459"></a>
+<span class="sourceLineNo">460</span> if (preTableCfs == null) {<a name="line.460"></a>
+<span class="sourceLineNo">461</span> throw new ReplicationException("Table-Cfs for peer: " + id + " is null");<a name="line.461"></a>
+<span class="sourceLineNo">462</span> }<a name="line.462"></a>
+<span class="sourceLineNo">463</span> Map<TableName, List<String>> newTableCfs = copyTableCFsMap(preTableCfs);<a name="line.463"></a>
+<span class="sourceLineNo">464</span> for (Map.Entry<TableName, ? extends Collection<String>> entry : tableCfs.entrySet()) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> TableName table = entry.getKey();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> Collection<String> removeCfs = entry.getValue();<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (newTableCfs.containsKey(table)) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> List<String> cfs = newTableCfs.get(table);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> if (cfs == null && (removeCfs == null || removeCfs.isEmpty())) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> newTableCfs.remove(table);<a name="line.470"></a>
+<span class="sourceLineNo">471</span> } else if (cfs != null && (removeCfs != null && !removeCfs.isEmpty())) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> Set<String> cfSet = new HashSet<String>(cfs);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> cfSet.removeAll(removeCfs);<a name="line.473"></a>
+<span class="sourceLineNo">474</span> if (cfSet.isEmpty()) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> newTableCfs.remove(table);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> } else {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> newTableCfs.put(table, Lists.newArrayList(cfSet));<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span> } else if (cfs == null && (removeCfs != null && !removeCfs.isEmpty())) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> throw new ReplicationException("Cannot remove cf of table: " + table<a name="line.480"></a>
+<span class="sourceLineNo">481</span> + " which doesn't specify cfs from table-cfs config in peer: " + id);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> } else if (cfs != null && (removeCfs == null || removeCfs.isEmpty())) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> throw new ReplicationException("Cannot remove table: " + table<a name="line.483"></a>
+<span class="sourceLineNo">484</span> + " which has specified cfs from table-cfs config in peer: " + id);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span> } else {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> throw new ReplicationException(<a name="line.487"></a>
+<span class="sourceLineNo">488</span> "No table: " + table + " in table-cfs config of peer: " + id);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> }<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span> ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(peerConfig);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> builder.setTableCFsMap(newTableCfs);<a name="line.492"></a>
+<span class="sourceLineNo">493</span> return builder.build();<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> /**<a name="line.496"></a>
+<span class="sourceLineNo">497</span> * Returns the configuration needed to talk to the remote slave cluster.<a name="line.497"></a>
+<span class="sourceLineNo">498</span> * @param conf the base configuration<a name="line.498"></a>
+<span class="sourceLineNo">499</span> * @param peer the description of replication peer<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * @return the configuration for the peer cluster, null if it was unable to get the configuration<a name="line.500"></a>
+<span class="sourceLineNo">501</span> * @throws IOException when create peer cluster configuration failed<a name="line.501"></a>
+<span class="sourceLineNo">502</span> */<a name="line.502"></a>
+<span class="sourceLineNo">503</span> public static Configuration getPeerClusterConfiguration(Configuration conf,<a name="line.503"></a>
+<span class="sourceLineNo">504</span> ReplicationPeerDescription peer) throws IOException {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> ReplicationPeerConfig peerConfig = peer.getPeerConfig();<a name="line.505"></a>
+<span class="sourceLineNo">506</span> Configuration otherConf;<a name="line.506"></a>
+<span class="sourceLineNo">507</span> try {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> otherConf = HBaseConfiguration.createClusterConf(conf, peerConfig.getClusterKey());<a name="line.508"></a>
+<span class="sourceLineNo">509</span> } catch (IOException e) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> throw new IOException("Can't get peer configuration for peerId=" + peer.getPeerId(), e);<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (!peerConfig.getConfiguration().isEmpty()) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> CompoundConfiguration compound = new CompoundConfiguration();<a name="line.514"></a>
+<span class="sourceLineNo">515</span> compound.add(otherConf);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> compound.addStringMap(peerConfig.getConfiguration());<a name="line.516"></a>
+<span class="sourceLineNo">517</span> return compound;<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> return otherConf;<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span>}<a name="line.522"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/854846a5/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
index 7f98047..b32ff89 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.RegionStateVisitor.html
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> MetaTableAccessor.addLocation(put, regionLocation, openSeqNum, replicaId);<a name="line.165"></a>
<span class="sourceLineNo">166</span> // only update replication barrier for default replica<a name="line.166"></a>
<span class="sourceLineNo">167</span> if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID &&<a name="line.167"></a>
-<span class="sourceLineNo">168</span> hasSerialReplicationScope(regionInfo.getTable())) {<a name="line.168"></a>
+<span class="sourceLineNo">168</span> hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.168"></a>
<span class="sourceLineNo">169</span> MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
<span class="sourceLineNo">171</span> info.append(", openSeqNum=").append(openSeqNum);<a name="line.171"></a>
@@ -232,7 +232,7 @@
<span class="sourceLineNo">224</span> ServerName serverName) throws IOException {<a name="line.224"></a>
<span class="sourceLineNo">225</span> TableDescriptor htd = getTableDescriptor(parent.getTable());<a name="line.225"></a>
<span class="sourceLineNo">226</span> long parentOpenSeqNum = HConstants.NO_SEQNUM;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (htd.hasSerialReplicationScope()) {<a name="line.227"></a>
+<span class="sourceLineNo">227</span> if (htd.hasGlobalReplicationScope()) {<a name="line.227"></a>
<span class="sourceLineNo">228</span> parentOpenSeqNum = getOpenSeqNumForParentRegion(parent);<a name="line.228"></a>
<span class="sourceLineNo">229</span> }<a name="line.229"></a>
<span class="sourceLineNo">230</span> MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, hriA, hriB,<a name="line.230"></a>
@@ -247,7 +247,7 @@
<span class="sourceLineNo">239</span> TableDescriptor htd = getTableDescriptor(child.getTable());<a name="line.239"></a>
<span class="sourceLineNo">240</span> long regionAOpenSeqNum = -1L;<a name="line.240"></a>
<span class="sourceLineNo">241</span> long regionBOpenSeqNum = -1L;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (htd.hasSerialReplicationScope()) {<a name="line.242"></a>
+<span class="sourceLineNo">242</span> if (htd.hasGlobalReplicationScope()) {<a name="line.242"></a>
<span class="sourceLineNo">243</span> regionAOpenSeqNum = getOpenSeqNumForParentRegion(hriA);<a name="line.243"></a>
<span class="sourceLineNo">244</span> regionBOpenSeqNum = getOpenSeqNumForParentRegion(hriB);<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
@@ -269,12 +269,12 @@
<span class="sourceLineNo">261</span> // ==========================================================================<a name="line.261"></a>
<span class="sourceLineNo">262</span> // Table Descriptors helpers<a name="line.262"></a>
<span class="sourceLineNo">263</span> // ==========================================================================<a name="line.263"></a>
-<span class="sourceLineNo">264</span> private boolean hasSerialReplicationScope(TableName tableName) throws IOException {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return hasSerialReplicationScope(getTableDescriptor(tableName));<a name="line.265"></a>
+<span class="sourceLineNo">264</span> private boolean hasGlobalReplicationScope(TableName tableName) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return hasGlobalReplicationScope(getTableDescriptor(tableName));<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> private boolean hasSerialReplicationScope(TableDescriptor htd) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return htd != null ? htd.hasSerialReplicationScope() : false;<a name="line.269"></a>
+<span class="sourceLineNo">268</span> private boolean hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return htd != null ? htd.hasGlobalReplicationScope() : false;<a name="line.269"></a>
<span class="sourceLineNo">270</span> }<a name="line.270"></a>
<span class="sourceLineNo">271</span><a name="line.271"></a>
<span class="sourceLineNo">272</span> private int getRegionReplication(TableDescriptor htd) {<a name="line.272"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/854846a5/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
index 7f98047..b32ff89 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionStateStore.html
@@ -173,7 +173,7 @@
<span class="sourceLineNo">165</span> MetaTableAccessor.addLocation(put, regionLocation, openSeqNum, replicaId);<a name="line.165"></a>
<span class="sourceLineNo">166</span> // only update replication barrier for default replica<a name="line.166"></a>
<span class="sourceLineNo">167</span> if (regionInfo.getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID &&<a name="line.167"></a>
-<span class="sourceLineNo">168</span> hasSerialReplicationScope(regionInfo.getTable())) {<a name="line.168"></a>
+<span class="sourceLineNo">168</span> hasGlobalReplicationScope(regionInfo.getTable())) {<a name="line.168"></a>
<span class="sourceLineNo">169</span> MetaTableAccessor.addReplicationBarrier(put, openSeqNum);<a name="line.169"></a>
<span class="sourceLineNo">170</span> }<a name="line.170"></a>
<span class="sourceLineNo">171</span> info.append(", openSeqNum=").append(openSeqNum);<a name="line.171"></a>
@@ -232,7 +232,7 @@
<span class="sourceLineNo">224</span> ServerName serverName) throws IOException {<a name="line.224"></a>
<span class="sourceLineNo">225</span> TableDescriptor htd = getTableDescriptor(parent.getTable());<a name="line.225"></a>
<span class="sourceLineNo">226</span> long parentOpenSeqNum = HConstants.NO_SEQNUM;<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if (htd.hasSerialReplicationScope()) {<a name="line.227"></a>
+<span class="sourceLineNo">227</span> if (htd.hasGlobalReplicationScope()) {<a name="line.227"></a>
<span class="sourceLineNo">228</span> parentOpenSeqNum = getOpenSeqNumForParentRegion(parent);<a name="line.228"></a>
<span class="sourceLineNo">229</span> }<a name="line.229"></a>
<span class="sourceLineNo">230</span> MetaTableAccessor.splitRegion(master.getConnection(), parent, parentOpenSeqNum, hriA, hriB,<a name="line.230"></a>
@@ -247,7 +247,7 @@
<span class="sourceLineNo">239</span> TableDescriptor htd = getTableDescriptor(child.getTable());<a name="line.239"></a>
<span class="sourceLineNo">240</span> long regionAOpenSeqNum = -1L;<a name="line.240"></a>
<span class="sourceLineNo">241</span> long regionBOpenSeqNum = -1L;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (htd.hasSerialReplicationScope()) {<a name="line.242"></a>
+<span class="sourceLineNo">242</span> if (htd.hasGlobalReplicationScope()) {<a name="line.242"></a>
<span class="sourceLineNo">243</span> regionAOpenSeqNum = getOpenSeqNumForParentRegion(hriA);<a name="line.243"></a>
<span class="sourceLineNo">244</span> regionBOpenSeqNum = getOpenSeqNumForParentRegion(hriB);<a name="line.244"></a>
<span class="sourceLineNo">245</span> }<a name="line.245"></a>
@@ -269,12 +269,12 @@
<span class="sourceLineNo">261</span> // ==========================================================================<a name="line.261"></a>
<span class="sourceLineNo">262</span> // Table Descriptors helpers<a name="line.262"></a>
<span class="sourceLineNo">263</span> // ==========================================================================<a name="line.263"></a>
-<span class="sourceLineNo">264</span> private boolean hasSerialReplicationScope(TableName tableName) throws IOException {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return hasSerialReplicationScope(getTableDescriptor(tableName));<a name="line.265"></a>
+<span class="sourceLineNo">264</span> private boolean hasGlobalReplicationScope(TableName tableName) throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return hasGlobalReplicationScope(getTableDescriptor(tableName));<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> private boolean hasSerialReplicationScope(TableDescriptor htd) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return htd != null ? htd.hasSerialReplicationScope() : false;<a name="line.269"></a>
+<span class="sourceLineNo">268</span> private boolean hasGlobalReplicationScope(TableDescriptor htd) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return htd != null ? htd.hasGlobalReplicationScope() : false;<a name="line.269"></a>
<span class="sourceLineNo">270</span> }<a name="line.270"></a>
<span class="sourceLineNo">271</span><a name="line.271"></a>
<span class="sourceLineNo">272</span> private int getRegionReplication(TableDescriptor htd) {<a name="line.272"></a>