(pulsar) branch branch-2.10 updated: [fix][broker] Fix 'Disabled replicated subscriptions controller' logic and logging (#23142)

[zixuan]

This is an automated email from the ASF dual-hosted git repository.

zixuan pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new 018eb3f4e01 [fix][broker] Fix 'Disabled replicated subscriptions 
controller' logic and logging (#23142)
018eb3f4e01 is described below

commit 018eb3f4e01ae0fe491693dbcb34f66094ab544b
Author: hanmz <gunn...@tencent.com>
AuthorDate: Tue Aug 13 11:06:01 2024 +0800

    [fix][broker] Fix 'Disabled replicated subscriptions controller' logic and 
logging (#23142)
    
    (cherry picked from commit 9bf714ff756b0729094e9a8611137d3dcfaed5b0)
---
 .../org/apache/pulsar/broker/service/persistent/PersistentTopic.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
index b7b620e3388..553b2888c19 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java
@@ -2933,8 +2933,8 @@ public class PersistentTopic extends AbstractTopic 
implements Topic, AddEntryCal
             log.info("[{}] Enabling replicated subscriptions controller", 
topic);
             replicatedSubscriptionsController = Optional.of(new 
ReplicatedSubscriptionsController(this,
                     
brokerService.pulsar().getConfiguration().getClusterName()));
-        } else if (isCurrentlyEnabled && !shouldBeEnabled || 
!isEnableReplicatedSubscriptions
-                || !replicationEnabled) {
+        } else if (isCurrentlyEnabled && (!shouldBeEnabled || 
!isEnableReplicatedSubscriptions
+                || !replicationEnabled)) {
             log.info("[{}] Disabled replicated subscriptions controller", 
topic);
             
replicatedSubscriptionsController.ifPresent(ReplicatedSubscriptionsController::close);
             replicatedSubscriptionsController = Optional.empty();