merlimat closed pull request #1470: Fix topic deletion for V2 topics.
URL: https://github.com/apache/incubator-pulsar/pull/1470
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 04addf5cd..87d1b3ad5 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
@@ -464,7 +464,9 @@ protected void internalUnloadTopic(boolean authoritative) {
protected void internalDeleteTopic(boolean authoritative) {
validateAdminOperationOnTopic(authoritative);
Topic topic = getTopicReference(topicName);
- if (topicName.isGlobal()) {
+
+ // 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");
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
index 1b20ebdaf..9a6ab6e7f 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Topic.java
@@ -111,6 +111,8 @@ default long getOriginalSequenceId() {
boolean isEncryptionRequired();
+ boolean isReplicated();
+
BacklogQuota getBacklogQuota();
void updateRates(NamespaceStats nsStats, NamespaceBundleStats
currentBundleStats,
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
index 056062a74..fc6a920ef 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentTopic.java
@@ -958,6 +958,11 @@ public boolean isEncryptionRequired() {
return isEncryptionRequired;
}
+ @Override
+ public boolean isReplicated() {
+ return replicators.size() > 1;
+ }
+
@Override
public CompletableFuture<Void> unsubscribe(String subName) {
// No-op
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 c179aef8c..e5b79bf7a 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
@@ -1497,6 +1497,11 @@ public boolean isEncryptionRequired() {
return isEncryptionRequired;
}
+ @Override
+ public boolean isReplicated() {
+ return replicators.size() > 1;
+ }
+
public CompletableFuture<MessageId> terminate() {
CompletableFuture<MessageId> future = new CompletableFuture<>();
ledger.asyncTerminate(new TerminateCallback() {
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
