This is an automated email from the ASF dual-hosted git repository.
zixuan pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 89519cce241f6cb94509e86f9ac61765b2098863
Author: Zixuan Liu <node...@gmail.com>
AuthorDate: Fri Dec 27 19:19:03 2024 +0800
[fix][broker] Fix enableReplicatedSubscriptions (#23781)
Signed-off-by: Zixuan Liu <node...@gmail.com>
(cherry picked from commit 6e3eaf5150907ecb12bfec3022c26467c16e4721)
---
.../broker/service/persistent/PersistentTopic.java | 6 +-
...nableReplicatedSubscriptionsIsDisabledTest.java | 83 ++++++++++++++++++++++
2 files changed, 87 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 f6fe1a2f8de..56aeb9b4a5e 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
@@ -911,9 +911,11 @@ public class PersistentTopic extends AbstractTopic
implements Topic, AddEntryCal
}
return brokerService.checkTopicNsOwnership(getName()).thenCompose(__
-> {
- if (replicatedSubscriptionStateArg != null &&
replicatedSubscriptionStateArg
+ Boolean replicatedSubscriptionState =
replicatedSubscriptionStateArg;
+ if (replicatedSubscriptionState != null &&
replicatedSubscriptionState
&&
!brokerService.pulsar().getConfiguration().isEnableReplicatedSubscriptions()) {
log.warn("[{}] Replicated Subscription is disabled by
broker.", getName());
+ replicatedSubscriptionState = false;
}
if (subType == SubType.Key_Shared
@@ -982,7 +984,7 @@ public class PersistentTopic extends AbstractTopic
implements Topic, AddEntryCal
CompletableFuture<? extends Subscription> subscriptionFuture =
isDurable
? getDurableSubscription(subscriptionName,
initialPosition, startMessageRollbackDurationSec,
- replicatedSubscriptionStateArg, subscriptionProperties)
+ replicatedSubscriptionState, subscriptionProperties)
: getNonDurableSubscription(subscriptionName,
startMessageId, initialPosition,
startMessageRollbackDurationSec, readCompacted,
subscriptionProperties);
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/EnableReplicatedSubscriptionsIsDisabledTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/EnableReplicatedSubscriptionsIsDisabledTest.java
new file mode 100644
index 00000000000..d002261cee4
--- /dev/null
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/EnableReplicatedSubscriptionsIsDisabledTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.client.api;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import lombok.Cleanup;
+import org.apache.pulsar.broker.service.Subscription;
+import org.apache.pulsar.broker.service.Topic;
+import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
+import org.apache.pulsar.common.naming.TopicName;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker-api")
+public class EnableReplicatedSubscriptionsIsDisabledTest extends
ProducerConsumerBase {
+
+ @BeforeClass
+ @Override
+ protected void setup() throws Exception {
+ super.internalSetup();
+ super.producerBaseSetup();
+ }
+
+ @Override
+ protected void doInitConf() throws Exception {
+ super.doInitConf();
+ conf.setEnableReplicatedSubscriptions(false);
+ }
+
+ @AfterClass(alwaysRun = true)
+ @Override
+ protected void cleanup() throws Exception {
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testReplicateSubscriptionStateIsEnabled() throws Exception {
+ String topicName =
TopicName.get("my-property/my-ns/testReplicateSubscriptionStateIsEnabled").toString();
+ String subName = "my-subscription";
+ @Cleanup
+ Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
+ .topic(topicName)
+ .subscriptionName(subName)
+ .replicateSubscriptionState(true)
+ .subscribe();
+ CompletableFuture<Optional<Topic>> topicIfExists =
pulsar.getBrokerService().getTopicIfExists(topicName);
+ assertThat(topicIfExists)
+ .succeedsWithin(3, TimeUnit.SECONDS)
+ .matches(optionalTopic -> {
+ assertTrue(optionalTopic.isPresent());
+ Topic topicRef = optionalTopic.get();
+ Subscription subscription =
topicRef.getSubscription(subName);
+ assertNotNull(subscription);
+ assertTrue(subscription instanceof PersistentSubscription);
+ PersistentSubscription persistentSubscription =
(PersistentSubscription) subscription;
+
assertEquals(persistentSubscription.getReplicatedControlled(), Boolean.FALSE);
+ return true;
+ });
+ }
+}
