From 3031c610f40ae118a2805770eae0a42ec614069c Mon Sep 17 00:00:00 2001
From: danpi <danxiaopi@gmail.com>
Date: Sat, 21 Dec 2024 19:20:56 +0800
Subject: [PATCH] [fix][admin] Fix exception loss in getMessageId method
 (#23766)

Co-authored-by: houbonan <houbonan@didiglobal.com>
(cherry picked from commit 3d505742e05e403144d17aef59c95e2758982a26)
(cherry picked from commit 79e05a2d1d2430c7c67e1e53e5ff55407f8d6351)
---
 .../pulsar/broker/admin/impl/PersistentTopicsBase.java     | 7 ++++---
 .../apache/pulsar/broker/admin/PersistentTopicsTest.java   | 4 ++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
index 6a7c39c0917b7..9dac4f28c40b1 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java
@@ -2877,9 +2877,10 @@ protected CompletableFuture<Response> internalGetMessageById(long ledgerId, long
                         public void readEntryFailed(ManagedLedgerException exception,
                                                     Object ctx) {
                             if (exception instanceof ManagedLedgerException.LedgerNotExistException) {
-                                throw new RestException(Status.NOT_FOUND, "Message id not found");
+                                results.completeExceptionally(
+                                        new RestException(Status.NOT_FOUND, "Message id not found"));
                             }
-                            throw new RestException(exception);
+                            results.completeExceptionally(new RestException(exception));
                         }
 
                         @Override
@@ -2887,7 +2888,7 @@ public void readEntryComplete(Entry entry, Object ctx) {
                             try {
                                 results.complete(generateResponseWithEntry(entry, (PersistentTopic) topic));
                             } catch (IOException exception) {
-                                throw new RestException(exception);
+                                results.completeExceptionally(new RestException(exception));
                             } finally {
                                 if (entry != null) {
                                     entry.release();
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index bf4c1f938f035..e0621f364c8c1 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -1377,6 +1377,10 @@ public void testGetMessageById() throws Exception {
         Assert.expectThrows(PulsarAdminException.NotFoundException.class, () -> {
             admin.topics().getMessageById(topicName1, id2.getLedgerId(), id2.getEntryId());
         });
+
+        Assert.expectThrows(PulsarAdminException.ServerSideErrorException.class, () -> {
+            admin.topics().getMessageById(topicName1, id1.getLedgerId(), id1.getEntryId() + 10);
+        });
     }
 
     @Test