Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19621 (addendum) Revisit the methods in ReplicationPeerConfigBuilder

This commit is contained in:
Guanghao Zhang 2017-12-26 20:56:56 +08:00
parent 7ce1943ef3
commit 80c7e4ea79
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java
View File

@ -363,9 +363,14 @@ public class ReplicationPeersZKImpl extends ReplicationStateZKBase implements Re
} }
// Update existingConfig's peer config and peer data with the new values, but don't touch config // Update existingConfig's peer config and peer data with the new values, but don't touch config
// or data that weren't explicitly changed // or data that weren't explicitly changed
ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(newConfig); ReplicationPeerConfigBuilder builder = ReplicationPeerConfig.newBuilder(existingConfig);
builder.putAllConfiguration(existingConfig.getConfiguration()); builder.putAllConfiguration(newConfig.getConfiguration())
builder.putAllPeerData(existingConfig.getPeerData()); .putAllPeerData(newConfig.getPeerData())
.setReplicateAllUserTables(newConfig.replicateAllUserTables())
.setNamespaces(newConfig.getNamespaces()).setTableCFsMap(newConfig.getTableCFsMap())
.setExcludeNamespaces(newConfig.getExcludeNamespaces())
.setExcludeTableCFsMap(newConfig.getExcludeTableCFsMap())
.setBandwidth(newConfig.getBandwidth());
try { try {
ZKUtil.setData(this.zookeeper, getPeerNode(id), ZKUtil.setData(this.zookeeper, getPeerNode(id),