[pulsar] branch branch-2.10 updated: [fix] [broker] delete topic failed if disabled system topic (#19735)

[yu...@apache.org]

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

yubiao 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 22a0c6df266 [fix] [broker] delete topic failed if disabled system topic (#19735)
22a0c6df266 is described below

commit 22a0c6df266812c9852bedbfeb2937bb38fe0516
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Thu Mar 9 15:13:50 2023 +0800

    [fix] [broker] delete topic failed if disabled system topic (#19735)
    
    Motivation: After PR #18823, The cmd delete topic will fail if disabled the feature system topic.
    Modifications: do not delete the system policy if disabled the feature system topic
    (cherry picked from commit 401fb055ed428b7f3e33a49cea78b25b04f7448e)
---
 .../broker/service/persistent/PersistentTopic.java |  3 +-
 .../client/impl/DisabledSystemTopicTest.java       | 61 ++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

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 1d8ba95b2f7..516d85fd6aa 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
@@ -1187,7 +1187,8 @@ public class PersistentTopic extends AbstractTopic implements Topic, AddEntryCal
                     deleteTopicAuthenticationFuture.thenCompose(__ -> deleteSchema ? deleteSchema() :
                                     CompletableFuture.completedFuture(null))
                             .thenCompose(ignore -> {
-                                if (!EventsTopicNames.isTopicPoliciesSystemTopic(topic)) {
+                                if (!EventsTopicNames.isTopicPoliciesSystemTopic(topic)
+                                        && brokerService.getPulsar().getConfiguration().isSystemTopicEnabled()) {
                                     return deleteTopicPolicies();
                                 } else {
                                     return CompletableFuture.completedFuture(null);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DisabledSystemTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DisabledSystemTopicTest.java
new file mode 100644
index 00000000000..7747d3a576c
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/DisabledSystemTopicTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.impl;
+
+import java.util.UUID;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.ProducerConsumerBase;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Slf4j
+@Test(groups = "broker")
+public class DisabledSystemTopicTest extends ProducerConsumerBase {
+
+    @Override
+    @BeforeMethod
+    public void setup() throws Exception {
+        super.internalSetup();
+        super.producerBaseSetup();
+    }
+
+    @Override
+    @AfterMethod(alwaysRun = true)
+    public void cleanup() throws Exception {
+        super.internalCleanup();
+    }
+
+    protected void doInitConf() throws Exception {
+        super.doInitConf();
+        conf.setTransactionCoordinatorEnabled(false);
+        conf.setSystemTopicEnabled(false);
+    }
+
+    @Test
+    public void testDeleteTopic() throws Exception {
+        String topicName = "persistent://my-property/my-ns/tp_" + UUID.randomUUID().toString();
+
+        admin.topics().createNonPartitionedTopic(topicName);
+        admin.topics().delete(topicName, false);
+
+        admin.topics().createPartitionedTopic(topicName, 3);
+        admin.topics().deletePartitionedTopic(topicName);
+    }
+}