This is an automated email from the ASF dual-hosted git repository. yong pushed a commit to branch branch-4.16 in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 02074ad7a31954b9d77f197eb773378318909069 Author: wenbingshen <[email protected]> AuthorDate: Mon Jun 19 11:12:19 2023 +0800 Reduce unnecessary creation of ReplicationEnableCb objects (#3960) ### Motivation Create `ReplicationEnableCb` when the if condition is true. (cherry picked from commit 945df0ce3978f1dc64b4ffe7e44bc2f659866f9b) --- .../org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java | 2 +- .../src/main/java/org/apache/bookkeeper/replication/Auditor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java index 8587ac0ca0..a8c30c4327 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/ZkLedgerUnderreplicationManager.java @@ -620,8 +620,8 @@ public class ZkLedgerUnderreplicationManager implements LedgerUnderreplicationMa private void waitIfLedgerReplicationDisabled() throws UnavailableException, InterruptedException { - ReplicationEnableCb cb = new ReplicationEnableCb(); if (!this.isLedgerReplicationEnabled()) { + ReplicationEnableCb cb = new ReplicationEnableCb(); this.notifyLedgerReplicationEnabled(cb); cb.await(); } diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java index ceac7c56f8..220d52d8e5 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java @@ -586,8 +586,8 @@ public class Auditor implements AutoCloseable { private void waitIfLedgerReplicationDisabled() throws UnavailableException, InterruptedException { - ReplicationEnableCb cb = new ReplicationEnableCb(); if (!ledgerUnderreplicationManager.isLedgerReplicationEnabled()) { + ReplicationEnableCb cb = new ReplicationEnableCb(); LOG.info("LedgerReplication is disabled externally through Zookeeper, " + "since DISABLE_NODE ZNode is created, so waiting untill it is enabled"); ledgerUnderreplicationManager.notifyLedgerReplicationEnabled(cb);
