[improve][broker] Propagate cause exception in TopicBusyException whe…

…n applicable (apache#22596) (cherry picked from commit 3b9602c) (cherry picked from commit d00d715)
datastax · May 16, 2024 · c9586ae · c9586ae
1 parent d1e3cce
commit c9586ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerServiceException.java
@@ -146,6 +146,10 @@ public static class TopicBusyException extends BrokerServiceException {
         public TopicBusyException(String msg) {
             super(msg);
         }
+
+        public TopicBusyException(String msg, Throwable t) {
+            super(msg, t);
+        }
     }
 
     public static class TopicNotFoundException extends BrokerServiceException {

diff --git a/...oker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java b/...oker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -472,7 +472,8 @@ private CompletableFuture<Void> delete(boolean failIfHasSubscriptions, boolean c
                 }
             }).exceptionally(ex -> {
                 deleteFuture.completeExceptionally(
-                        new TopicBusyException("Failed to close clients before deleting topic."));
+                        new TopicBusyException("Failed to close clients before deleting topic.",
+                                FutureUtil.unwrapCompletionException(ex)));
                 return null;
             });
         } finally {

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
@@ -1446,7 +1446,8 @@ public void deleteLedgerComplete(Object ctx) {
                 }).exceptionally(ex->{
                     unfenceTopicToResume();
                     deleteFuture.completeExceptionally(
-                            new TopicBusyException("Failed to close clients before deleting topic."));
+                            new TopicBusyException("Failed to close clients before deleting topic.",
+                                    FutureUtil.unwrapCompletionException(ex)));
                     return null;
                 });