You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by eo...@apache.org on 2022/09/14 06:42:09 UTC
[pulsar] branch master updated: Issue 17588: Allow deletion of a namespace that was left in deleted status (#17592)
This is an automated email from the ASF dual-hosted git repository.
eolivelli 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 869339dbde7 Issue 17588: Allow deletion of a namespace that was left in deleted status (#17592)
869339dbde7 is described below
commit 869339dbde719a11768687c58f6cd1d86666a341
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Wed Sep 14 08:42:02 2022 +0200
Issue 17588: Allow deletion of a namespace that was left in deleted status (#17592)
---
.../org/apache/pulsar/broker/namespace/NamespaceService.java | 2 +-
.../java/org/apache/pulsar/broker/web/PulsarWebResource.java | 7 ++++++-
.../java/org/apache/pulsar/broker/admin/NamespacesTest.java | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
index 3467d25777e..9f3d36043b8 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/namespace/NamespaceService.java
@@ -1238,7 +1238,7 @@ public class NamespaceService implements AutoCloseable {
public CompletableFuture<List<String>> getListOfNonPersistentTopics(NamespaceName namespaceName) {
- return PulsarWebResource.checkLocalOrGetPeerReplicationCluster(pulsar, namespaceName)
+ return PulsarWebResource.checkLocalOrGetPeerReplicationCluster(pulsar, namespaceName, true)
.thenCompose(peerClusterData -> {
// if peer-cluster-data is present it means namespace is owned by that peer-cluster and request
// should redirect to the peer-cluster
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
index 85638831bbb..2184ca44f2a 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
@@ -856,6 +856,11 @@ public abstract class PulsarWebResource {
public static CompletableFuture<ClusterDataImpl> checkLocalOrGetPeerReplicationCluster(PulsarService pulsarService,
NamespaceName namespace) {
+ return checkLocalOrGetPeerReplicationCluster(pulsarService, namespace, false);
+ }
+ public static CompletableFuture<ClusterDataImpl> checkLocalOrGetPeerReplicationCluster(PulsarService pulsarService,
+ NamespaceName namespace,
+ boolean allowDeletedNamespace) {
if (!namespace.isGlobal() || NamespaceService.isHeartbeatNamespace(namespace)) {
return CompletableFuture.completedFuture(null);
}
@@ -867,7 +872,7 @@ public abstract class PulsarWebResource {
.getPoliciesAsync(namespace).thenAccept(policiesResult -> {
if (policiesResult.isPresent()) {
Policies policies = policiesResult.get();
- if (policies.deleted) {
+ if (!allowDeletedNamespace && policies.deleted) {
String msg = String.format("Namespace %s is deleted", namespace.toString());
log.warn(msg);
validationFuture.completeExceptionally(new RestException(Status.PRECONDITION_FAILED,
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
index 73cf4914ffe..c43faa35279 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/NamespacesTest.java
@@ -1200,6 +1200,18 @@ public class NamespacesTest extends MockedPulsarServiceBaseTest {
topicList = admin.topics().getList(namespace);
assertTrue(topicList.isEmpty());
+ // simulate a partially deleted namespace, we should be able to recover
+ pulsar.getPulsarResources().getNamespaceResources()
+ .setPolicies(NamespaceName.get(namespace), old -> {
+ old.deleted = true;
+ return old;
+ });
+ admin.namespaces().deleteNamespace(namespace, true);
+
+ admin.namespaces().createNamespace(namespace, 100);
+ topicList = admin.topics().getList(namespace);
+ assertTrue(topicList.isEmpty());
+
// reset back to false
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false);
}