[GitHub] merlimat closed pull request #1529: Fix delete topic check and provide better error message.

[GitBox]

merlimat closed pull request #1529: Fix delete topic check and provide better 
error message.
URL: https://github.com/apache/incubator-pulsar/pull/1529
 
 
   

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 03a435d9c5..863272d5c6 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
@@ -470,8 +470,10 @@ protected void internalDeleteTopic(boolean authoritative) {
         // v2 topics have a global name so check if the topic is replicated.
         if (topic.isReplicated()) {
             // Delete is disallowed on global topic
-            log.error("[{}] Delete topic is forbidden on global namespace {}", 
clientAppId(), topicName);
-            throw new RestException(Status.FORBIDDEN, "Delete forbidden on 
global namespace");
+            final List<String> clusters = topic.getReplicators().keys();
+            log.error("[{}] Delete forbidden topic {} is replicated on 
clusters {}",
+                    clientAppId(), topicName, clusters);
+            throw new RestException(Status.FORBIDDEN, "Delete forbidden topic 
is replicated on clusters " + clusters);
         }
 
         try {
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 2d63fb6d11..c34ec84ba8 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
@@ -1507,7 +1507,7 @@ public boolean isEncryptionRequired() {
 
     @Override
     public boolean isReplicated() {
-        return replicators.size() > 1;
+        return !replicators.isEmpty();
     }
 
     public CompletableFuture<MessageId> terminate() {


 

----------------------------------------------------------------
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