merlimat closed pull request #2550: [WIP] Fix status code of REST API to get list of subscriptions of partition… URL: https://github.com/apache/incubator-pulsar/pull/2550
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): 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 da51453f8a..9f5c2dfe83 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 @@ -529,6 +529,12 @@ protected void internalDeleteTopic(boolean authoritative) { // subscriptions subscriptions.addAll(pulsar().getAdminClient().topics() .getSubscriptions(topicName.getPartition(0).toString())); + } catch (PulsarAdminException e) { + if (e.getStatusCode() == Status.NOT_FOUND.getStatusCode()) { + throw new RestException(Status.NOT_FOUND, "Internal topics have not been generated yet"); + } else { + throw new RestException(e); + } } catch (Exception e) { throw new RestException(e); } diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java index c7c090fd44..187539fa90 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java @@ -798,6 +798,16 @@ public void partitionedTopics(String topicName) throws Exception { fail(e.getMessage()); } + try { + admin.topics().getSubscriptions(partitionedTopicName); + fail("should have failed"); + } catch (PulsarAdminException e) { + // ok + assertEquals(e.getStatusCode(), Status.NOT_FOUND.getStatusCode()); + } catch (Exception e) { + fail(e.getMessage()); + } + // create consumer and subscription URL pulsarUrl = new URL("http://127.0.0.1" + ":" + BROKER_WEBSERVICE_PORT); PulsarClient client = PulsarClient.builder().serviceUrl(pulsarUrl.toString()).statsInterval(0, TimeUnit.SECONDS) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services