Passing force param to deleteNamespaceBundle when delete namespaces

apache · Oct 21, 2022 · 20f2bb6 · 20f2bb6
1 parent fa328a4
commit 20f2bb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java
@@ -267,7 +267,7 @@ protected CompletableFuture<Void> internalDeleteNamespaceAsync(boolean force) {
                                             return FutureUtil.failedFuture(ex);
                                         }
                                         return admin.namespaces().deleteNamespaceBundleAsync(namespaceName.toString(),
-                                                bundle.getBundleRange());
+                                                bundle.getBundleRange(), force);
                                     }
                                     return CompletableFuture.completedFuture(null);
                                 })

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
@@ -847,7 +847,7 @@ public boolean matches(NamespaceBundle bundle) {
         preconditionFailed.completeExceptionally(new PulsarAdminException.PreconditionFailedException(cee,
                 httpError, statusCode));
         doReturn(preconditionFailed).when(namespacesAdmin)
-                .deleteNamespaceBundleAsync(Mockito.anyString(), Mockito.anyString());
+                .deleteNamespaceBundleAsync(Mockito.anyString(), Mockito.anyString(), Mockito.anyBoolean());
 
         AsyncResponse response = mock(AsyncResponse.class);
         ArgumentCaptor<RestException> captor = ArgumentCaptor.forClass(RestException.class);
@@ -866,7 +866,8 @@ public boolean matches(NamespaceBundle bundle) {
         doReturn(Optional.of(localWebServiceUrl)).when(nsSvc).getWebServiceUrl(nsBundles.getBundles().get(0), optionsHttps);
         doReturn(true).when(nsSvc).isServiceUnitOwned(nsBundles.getBundles().get(0));
         doReturn(CompletableFuture.completedFuture(null)).when(namespacesAdmin).deleteNamespaceBundleAsync(
-                testTenant + "/" + testLocalCluster + "/" + bundledNsLocal, "0x00000000_0x80000000");
+                testTenant + "/" + testLocalCluster + "/" + bundledNsLocal, "0x00000000_0x80000000",
+                false);
         response = mock(AsyncResponse.class);
         namespaces.deleteNamespaceBundle(response, testTenant, testLocalCluster, bundledNsLocal,
                 "0x80000000_0xffffffff",  false, false);