(pulsar) branch branch-3.2 updated: [fix] [broker] print non log when delete partitioned topic failed (#22153)

[technoboy]

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

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


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 991068f2eb7 [fix] [broker] print non log when delete partitioned topic 
failed (#22153)
991068f2eb7 is described below

commit 991068f2eb74981437a6c137dffec8beb2f4f3a0
Author: fengyubiao <yubiao.f...@streamnative.io>
AuthorDate: Thu Feb 29 12:47:54 2024 +0800

    [fix] [broker] print non log when delete partitioned topic failed (#22153)
---
 .../apache/pulsar/broker/service/persistent/PersistentTopic.java    | 6 ++++--
 1 file changed, 4 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 df0fb8a5c9e..bb0796b48fd 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
@@ -2918,7 +2918,7 @@ public class PersistentTopic extends AbstractTopic 
implements Topic, AddEntryCal
 
             replCloseFuture.thenCompose(v -> delete(deleteMode == 
InactiveTopicDeleteMode.delete_when_no_subscriptions,
                 deleteMode == 
InactiveTopicDeleteMode.delete_when_subscriptions_caught_up, false))
-                    .thenApply((res) -> tryToDeletePartitionedMetadata())
+                    .thenCompose((res) -> tryToDeletePartitionedMetadata())
                     .thenRun(() -> log.info("[{}] Topic deleted successfully 
due to inactivity", topic))
                     .exceptionally(e -> {
                         if (e.getCause() instanceof TopicBusyException) {
@@ -2926,6 +2926,8 @@ public class PersistentTopic extends AbstractTopic 
implements Topic, AddEntryCal
                             if (log.isDebugEnabled()) {
                                 log.debug("[{}] Did not delete busy topic: 
{}", topic, e.getCause().getMessage());
                             }
+                        } else if (e.getCause() instanceof 
UnsupportedOperationException) {
+                            log.info("[{}] Skip to delete partitioned topic: 
{}", topic, e.getCause().getMessage());
                         } else {
                             log.warn("[{}] Inactive topic deletion failed", 
topic, e);
                         }
@@ -2970,7 +2972,7 @@ public class PersistentTopic extends AbstractTopic 
implements Topic, AddEntryCal
                                                         .filter(topicExist -> 
topicExist)
                                                         .findAny();
                                                 if 
(anyExistPartition.isPresent()) {
-                                                    log.error("[{}] Delete 
topic metadata failed because"
+                                                    log.info("[{}] Delete 
topic metadata failed because"
                                                             + " another 
partition exist.", topicName);
                                                     throw new 
UnsupportedOperationException(
                                                             
String.format("Another partition exists for [%s].",