[pulsar] branch master updated: [fix][broker] Fix http error message of Bookie rack placement config API when bookie-rack is not configured. (#20949)

[technoboy]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bafc8277940 [fix][broker] Fix http error message of Bookie rack 
placement config API when bookie-rack is not configured. (#20949)
bafc8277940 is described below

commit bafc8277940a827bc7a9f7c7d22f07dfe1b3ef47
Author: jack zhang <jack333zh...@gmail.com>
AuthorDate: Mon Aug 14 14:04:41 2023 +0800

    [fix][broker] Fix http error message of Bookie rack placement config API 
when bookie-rack is not configured. (#20949)
---
 .../main/java/org/apache/pulsar/broker/admin/v2/Bookies.java   |  4 ++--
 .../java/org/apache/pulsar/broker/admin/BookiesApiTest.java    | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java
index a50bc7515ff..537c886c5d3 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/v2/Bookies.java
@@ -113,7 +113,7 @@ public class Bookies extends AdminResource {
                         asyncResponse.resume(bi.get());
                     } else {
                         asyncResponse.resume(new 
RestException(Status.NOT_FOUND,
-                                "Bookie address not found: " + bookieAddress));
+                                "Bookie rack placement configuration not 
found: " + bookieAddress));
                     }
                 }).exceptionally(ex -> {
             asyncResponse.resume(ex);
@@ -136,7 +136,7 @@ public class Bookies extends AdminResource {
 
                     if (!brc.removeBookie(bookieAddress)) {
                         asyncResponse.resume(new 
RestException(Status.NOT_FOUND,
-                                "Bookie address not found: " + bookieAddress));
+                                "Bookie rack placement configuration not 
found: " + bookieAddress));
                     }
 
                     return brc;
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java
index 7b9d4344a4c..1bd1de2130b 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BookiesApiTest.java
@@ -66,6 +66,16 @@ public class BookiesApiTest extends 
MockedPulsarServiceBaseTest {
             fail("should not reach here");
         } catch (PulsarAdminException pae) {
             assertEquals(404, pae.getStatusCode());
+            assertEquals(pae.getHttpError(), "Bookie rack placement 
configuration not found: " + bookie0);
+        }
+
+        // delete bookie doesn't exist
+        try {
+            admin.bookies().deleteBookieRackInfo(bookie0);
+            fail("should not reach here");
+        } catch (PulsarAdminException pae) {
+            assertEquals(404, pae.getStatusCode());
+            assertEquals(pae.getHttpError(), "Bookie rack placement 
configuration not found: " + bookie0);
         }
 
         // update the bookie info