gjacoby126 commented on a change in pull request #2778:
URL: https://github.com/apache/hbase/pull/2778#discussion_r544691966
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
##########
@@ -502,25 +500,81 @@ public void testBasePeerConfigsForPeerMutations()
utilities[0].restartHBaseCluster(1);
admin = utilities[0].getAdmin();
- // Both retains the value of base configuration 1 value as before
restart.
- // Peer 1 (Update value), Peer 2 (Base Value)
- Assert.assertEquals(firstCustomPeerConfigUpdatedValue,
admin.getReplicationPeerConfig("1").
+ // Configurations should be updated after restart again
+ Assert.assertEquals(firstCustomPeerConfigValue,
admin.getReplicationPeerConfig("1").
getConfiguration().get(firstCustomPeerConfigKey));
Assert.assertEquals(firstCustomPeerConfigValue,
admin.getReplicationPeerConfig("2").
getConfiguration().get(firstCustomPeerConfigKey));
- // Peer 1 gets new base config as part of restart.
Assert.assertEquals(secondCustomPeerConfigValue,
admin.getReplicationPeerConfig("1").
getConfiguration().get(secondCustomPeerConfigKey));
- // Peer 2 retains the updated value as before restart.
- Assert.assertEquals(secondCustomPeerConfigUpdatedValue,
admin.getReplicationPeerConfig("2").
+ Assert.assertEquals(secondCustomPeerConfigValue,
admin.getReplicationPeerConfig("2").
getConfiguration().get(secondCustomPeerConfigKey));
} finally {
shutDownMiniClusters();
baseConfiguration.unset(ReplicationPeerConfigUtil.HBASE_REPLICATION_PEER_BASE_CONFIG);
}
}
+ @Test
+ public void testBasePeerConfigsRemovalForReplicationPeer()
+ throws Exception {
+ LOG.info("testBasePeerConfigsForPeerMutations");
+ String firstCustomPeerConfigKey = "hbase.xxx.custom_config";
+ String firstCustomPeerConfigValue = "test";
+
+ try {
+
baseConfiguration.set(ReplicationPeerConfigUtil.HBASE_REPLICATION_PEER_BASE_CONFIG,
+
firstCustomPeerConfigKey.concat("=").concat(firstCustomPeerConfigValue));
+ startMiniClusters(2);
+ addPeer("1", 0, 1);
+ Admin admin = utilities[0].getAdmin();
+
+ // Validates base configs 1 is present for both peer.
+ Assert.assertEquals(firstCustomPeerConfigValue,
admin.getReplicationPeerConfig("1").
+ getConfiguration().get(firstCustomPeerConfigKey));
+
+ utilities[0].getConfiguration().unset(ReplicationPeerConfigUtil.
+ HBASE_REPLICATION_PEER_BASE_CONFIG);
+ utilities[0].getConfiguration().set(ReplicationPeerConfigUtil.
+ HBASE_REPLICATION_PEER_BASE_CONFIG,
firstCustomPeerConfigKey.concat("=").concat(""));
+
+
+ utilities[0].shutdownMiniHBaseCluster();
+ utilities[0].restartHBaseCluster(1);
+ admin = utilities[0].getAdmin();
+
+ // Configurations should be removed after restart again
+ Assert.assertNull(admin.getReplicationPeerConfig("1")
+ .getConfiguration().get(firstCustomPeerConfigKey));
+ } finally {
+ shutDownMiniClusters();
+
baseConfiguration.unset(ReplicationPeerConfigUtil.HBASE_REPLICATION_PEER_BASE_CONFIG);
+ }
+ }
+
+ @Test
+ public void testRemoveBasePeerConfigWithoutExistingConfigForReplicationPeer()
+ throws Exception {
+ LOG.info("testBasePeerConfigsForPeerMutations");
+ String firstCustomPeerConfigKey = "hbase.xxx.custom_config";
+
+ try {
+
baseConfiguration.set(ReplicationPeerConfigUtil.HBASE_REPLICATION_PEER_BASE_CONFIG,
+ firstCustomPeerConfigKey.concat("=").concat(""));
+ startMiniClusters(2);
+ addPeer("1", 0, 1);
+ Admin admin = utilities[0].getAdmin();
+
+ // Validates base configs 1 is present for both peer.
Review comment:
nit: comment appears to be incorrect
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
