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

HBASE-17317 [branch-1] The updatePeerConfig method in ReplicationPeersZKImpl didn't update the table-cfs map

This commit is contained in:
Guanghao Zhang 2016-12-20 18:51:26 +08:00
parent 4c7f0f2436
commit 97d1ba4015
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -375,6 +375,7 @@ public class ReplicationPeersZKImpl extends ReplicationStateZKBase implements Re
// or data that weren't explicitly changed // or data that weren't explicitly changed
existingConfig.getConfiguration().putAll(newConfig.getConfiguration()); existingConfig.getConfiguration().putAll(newConfig.getConfiguration());
existingConfig.getPeerData().putAll(newConfig.getPeerData()); existingConfig.getPeerData().putAll(newConfig.getPeerData());
existingConfig.setTableCFsMap(newConfig.getTableCFsMap());
existingConfig.setBandwidth(newConfig.getBandwidth()); existingConfig.setBandwidth(newConfig.getBandwidth());
try { try {
ZKUtil.setData(this.zookeeper, getPeerNode(id), ZKUtil.setData(this.zookeeper, getPeerNode(id),

38
hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
View File

@ -380,4 +380,42 @@ public class TestReplicationAdmin {
assertEquals(2097152, admin.getPeerConfig(ID_ONE).getBandwidth()); assertEquals(2097152, admin.getPeerConfig(ID_ONE).getBandwidth());
admin.removePeer(ID_ONE); admin.removePeer(ID_ONE);
} }
@Test
public void testUpdatePeerConfig() throws Exception {
TableName tab1 = TableName.valueOf("t1");
TableName tab2 = TableName.valueOf("t2");
Map<TableName, List<String>> tableCFs = new HashMap<>();
ReplicationPeerConfig config = new ReplicationPeerConfig();
config.setClusterKey(KEY_ONE);
config.getConfiguration().put("key1", "value1");
tableCFs.put(tab1, new ArrayList<String>());
config.setTableCFsMap(tableCFs);
admin.addPeer(ID_ONE, config, null);
admin.peerAdded(ID_ONE);
config = admin.getPeerConfig(ID_ONE);
assertEquals("value1", config.getConfiguration().get("key1"));
assertNull(config.getConfiguration().get("key2"));
assertTrue(config.getTableCFsMap().containsKey(tab1));
assertFalse(config.getTableCFsMap().containsKey(tab2));
// Update replication peer config
config = new ReplicationPeerConfig();
config.setClusterKey(KEY_ONE);
config.getConfiguration().put("key2", "value2");
tableCFs.clear();
tableCFs.put(tab2, new ArrayList<String>());
config.setTableCFsMap(tableCFs);
admin.updatePeerConfig(ID_ONE, config);
config = admin.getPeerConfig(ID_ONE);
assertEquals("value1", config.getConfiguration().get("key1"));
assertEquals("value2", config.getConfiguration().get("key2"));
assertFalse(config.getTableCFsMap().containsKey(tab1));
assertTrue(config.getTableCFsMap().containsKey(tab2));
admin.removePeer(ID_ONE);
}
} }