This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 690ca8c562f [HBASE-27789] Backport "HBASE-24914 Remove duplicate code
appearing continuously in method ReplicationPeerManager.updatePeerConfig" to
branch-2 (#5180)
690ca8c562f is described below
commit 690ca8c562fdc3d0316141c5cb0a4149be608bbb
Author: lizhexi0928 <[email protected]>
AuthorDate: Fri Apr 14 18:43:31 2023 +0800
[HBASE-27789] Backport "HBASE-24914 Remove duplicate code appearing
continuously in method ReplicationPeerManager.updatePeerConfig" to branch-2
(#5180)
Signed-off-by: Wellington Chevreuil <[email protected]>
---
.../apache/hadoop/hbase/master/replication/ReplicationPeerManager.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
index 58c9e33510d..73166fb8bed 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/replication/ReplicationPeerManager.java
@@ -216,8 +216,6 @@ public class ReplicationPeerManager {
// we need to use the new conf to overwrite the old one.
newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());
newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());
- newPeerConfigBuilder.putAllConfiguration(oldPeerConfig.getConfiguration());
- newPeerConfigBuilder.putAllConfiguration(peerConfig.getConfiguration());
ReplicationPeerConfig newPeerConfig = newPeerConfigBuilder.build();
peerStorage.updatePeerConfig(peerId, newPeerConfig);
peers.put(peerId, new ReplicationPeerDescription(peerId, desc.isEnabled(),
newPeerConfig));
