(pulsar) 03/04: [fix] [broker] print non log when delete partitioned topic failed (#22153)

[rgao]

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

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

commit bbbd1ef5314049b15957737808a29e61160aac0d
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)
    
    (cherry picked from commit 72cedb7020c75ada0d26b8120e55e0bec4467f13)
---
 .../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 12f0f738bb8..2752f247853 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
@@ -2688,7 +2688,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) {
@@ -2696,6 +2696,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);
                         }
@@ -2740,7 +2742,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].",