From ae018a3b5057d50d384d95e6b278f0af61206666 Mon Sep 17 00:00:00 2001 From: lizhexi0928 Date: Thu, 13 Apr 2023 23:57:47 +0800 Subject: [PATCH] [HBASE-27789] Backport "HBASE-24914 Remove duplicate code appearing continuously in method ReplicationPeerManager.updatePeerConfig" to branch-2 --- .../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 58c9e33510df..73166fb8bed1 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 void updatePeerConfig(String peerId, ReplicationPeerConfig peerConfig) // 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));