This is an automated email from the ASF dual-hosted git repository.
penghui 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 7f4aac5 [Broker] Remove check resource when delete failure domain
(#13421)
7f4aac5 is described below
commit 7f4aac55a0c9d82fc689e6de60afc9c611a534dc
Author: Zixuan Liu <[email protected]>
AuthorDate: Tue Dec 28 19:30:17 2021 +0800
[Broker] Remove check resource when delete failure domain (#13421)
### Motivation
This PR is used to keep same behavior with Pulsar 2.8 and 2.7 version.
In Pulsar 2.7 and 2.8, when delete a non-existent failure domain resource,
it will return 404 status code.
In Pulsar 2.9, when delete a non-existent failure domain resource, it will
return 200 status code.
Reproduce in Pulsar 2.8:
```
$ docker run -itd \
-p 6650:6650 \
-p 8080:8080 \
apachepulsar/pulsar:2.8.1 \
bin/pulsar standalone
$ pulsarctl clusters delete-failure-domain standalone
non-existent-failure-domain
[✖] code: 404 reason: Domain-name non-existent-failure-domain or cluster
standalone does not exist
```
Reproduce in Pulsar 2.9:
```
$ docker run -itd \
-p 6650:6650 \
-p 8080:8080 \
apachepulsar/pulsar:2.9.0 \
bin/pulsar standalone
$ pulsarctl clusters delete-failure-domain standalone
non-existent-failure-domain
Delete failure domain [non-existent-failure-domain] for cluster
[standalone] succeed
```
Affected version: 2.9.x
This issue was caused by https://github.com/apache/pulsar/pull/11693.
### Modifications
- Remove check resource exists when call the
`ClusterResources#deleteFailureDomain()`
- Add check resource exists when call the
`ClusterResources#deleteFailureDomains()`
---
.../pulsar/broker/resources/ClusterResources.java | 12 +--
.../pulsar/broker/admin/AdminApiClusterTest.java | 98 ++++++++++++++++++++++
2 files changed, 104 insertions(+), 6 deletions(-)
diff --git
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java
index a4ee27a..32586d2 100644
---
a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java
+++
b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/ClusterResources.java
@@ -121,20 +121,20 @@ public class ClusterResources extends
BaseResources<ClusterData> {
public void deleteFailureDomain(String clusterName, String domainName)
throws MetadataStoreException {
String path = joinPath(BASE_CLUSTERS_PATH, clusterName,
FAILURE_DOMAIN, domainName);
- if (exists(path)) {
- delete(path);
- }
+ delete(path);
}
public void deleteFailureDomains(String clusterName) throws
MetadataStoreException {
String failureDomainPath = joinPath(BASE_CLUSTERS_PATH,
clusterName, FAILURE_DOMAIN);
+ if (!exists(failureDomainPath)) {
+ return;
+ }
+
for (String domain : getChildren(failureDomainPath)) {
delete(joinPath(failureDomainPath, domain));
}
- if (exists(failureDomainPath)) {
- delete(failureDomainPath);
- }
+ delete(failureDomainPath);
}
public void setFailureDomainWithCreate(String clusterName, String
domainName,
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java
new file mode 100644
index 0000000..83ef9af
--- /dev/null
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiClusterTest.java
@@ -0,0 +1,98 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.broker.admin;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+
+import com.google.common.collect.Sets;
+import java.util.UUID;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
+import org.apache.pulsar.client.admin.PulsarAdminException;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.FailureDomain;
+import org.awaitility.Awaitility;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+@Test(groups = "broker")
+@Slf4j
+public class AdminApiClusterTest extends MockedPulsarServiceBaseTest {
+ private final String CLUSTER = "test";
+
+ @BeforeMethod
+ @Override
+ public void setup() throws Exception {
+ resetConfig();
+ super.internalSetup();
+ admin.clusters()
+ .createCluster(CLUSTER,
ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());
+ }
+
+ @AfterMethod(alwaysRun = true)
+ @Override
+ public void cleanup() throws Exception {
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testDeleteNonExistCluster() {
+ String cluster = "test-non-exist-cluster-" + UUID.randomUUID();
+
+ assertThrows(PulsarAdminException.NotFoundException.class, () ->
admin.clusters().deleteCluster(cluster));
+ }
+
+ @Test
+ public void testDeleteExistCluster() throws PulsarAdminException {
+ String cluster = "test-exist-cluster-" + UUID.randomUUID();
+
+ admin.clusters()
+ .createCluster(cluster,
ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build());
+ Awaitility.await().untilAsserted(() ->
assertNotNull(admin.clusters().getCluster(cluster)));
+
+ admin.clusters().deleteCluster(cluster);
+ }
+
+ @Test
+ public void testDeleteNonExistentFailureDomain() {
+ assertThrows(PulsarAdminException.NotFoundException.class,
+ () -> admin.clusters().deleteFailureDomain(CLUSTER,
"non-existent-failure-domain"));
+ }
+
+ @Test
+ public void testDeleteNonExistentFailureDomainInNonExistCluster() {
+ assertThrows(PulsarAdminException.PreconditionFailedException.class,
+ () -> admin.clusters().deleteFailureDomain(CLUSTER +
UUID.randomUUID(),
+ "non-existent-failure-domain"));
+ }
+
+ @Test
+ public void testDeleteExistFailureDomain() throws PulsarAdminException {
+ String domainName = CLUSTER + "-failure-domain";
+ FailureDomain domain = FailureDomain.builder()
+ .brokers(Sets.newHashSet("b1", "b2", "b3"))
+ .build();
+ admin.clusters().createFailureDomain(CLUSTER, domainName, domain);
+ Awaitility.await().untilAsserted(() ->
admin.clusters().getFailureDomain(CLUSTER, domainName));
+
+ admin.clusters().deleteFailureDomain(CLUSTER, domainName);
+ }
+}
