You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/04/10 02:23:35 UTC
[incubator-pulsar] branch master updated: Fix delete topic check
and provide better error message. (#1529)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new dc9a9dc Fix delete topic check and provide better error message. (#1529)
dc9a9dc is described below
commit dc9a9dc808dcea35d5570ad5c6d8d22183ce0a7d
Author: cckellogg <cc...@gmail.com>
AuthorDate: Mon Apr 9 19:23:32 2018 -0700
Fix delete topic check and provide better error message. (#1529)
* Fix delete topic check and provide better error message.
* Update error message.
* Update log to match exception.
---
.../org/apache/pulsar/broker/admin/impl/PersistentTopicsBase.java | 6 ++++--
.../apache/pulsar/broker/service/persistent/PersistentTopic.java | 2 +-
2 files changed, 5 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 03a435d..863272d 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 @@ public class PersistentTopicsBase extends AdminResource {
// 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 2d63fb6..c34ec84 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 class PersistentTopic implements Topic, AddEntryCallback {
@Override
public boolean isReplicated() {
- return replicators.size() > 1;
+ return !replicators.isEmpty();
}
public CompletableFuture<MessageId> terminate() {
--
To stop receiving notification emails like this one, please contact
mmerli@apache.org.