You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by xi...@apache.org on 2022/12/13 10:52:58 UTC
[pulsar] branch branch-2.10 updated: [improve][broker] Support setting forceDeleteTenantAllowed dynamically (#18192)
This is an automated email from the ASF dual-hosted git repository.
xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 2909c5a62e2 [improve][broker] Support setting forceDeleteTenantAllowed dynamically (#18192)
2909c5a62e2 is described below
commit 2909c5a62e21b817c3e489e5f5b4636f57b74239
Author: Jiwei Guo <te...@apache.org>
AuthorDate: Thu Oct 27 09:49:37 2022 +0800
[improve][broker] Support setting forceDeleteTenantAllowed dynamically (#18192)
(cherry picked from commit 1c78e0aabf576145c5f7831e931d89ae795bc2cc)
---
.../java/org/apache/pulsar/broker/ServiceConfiguration.java | 1 +
.../org/apache/pulsar/broker/service/BrokerServiceTest.java | 12 ++++++++++++
2 files changed, 13 insertions(+)
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
index a943fba356b..31ac55a18b7 100644
--- a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
+++ b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
@@ -568,6 +568,7 @@ public class ServiceConfiguration implements PulsarConfiguration {
@FieldContext(
category = CATEGORY_POLICIES,
+ dynamic = true,
doc = "Allow forced deletion of tenants. Default is false."
)
private boolean forceDeleteTenantAllowed = false;
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
index e479519f393..93cf004e017 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java
@@ -1360,4 +1360,16 @@ public class BrokerServiceTest extends BrokerTestBase {
assertTrue(conf.isForceDeleteNamespaceAllowed());
});
}
+
+ @Test
+ public void testDynamicConfigurationsForceDeleteTenantAllowed() throws Exception {
+ cleanup();
+ conf.setForceDeleteTenantAllowed(false);
+ setup();
+ admin.brokers()
+ .updateDynamicConfiguration("forceDeleteTenantAllowed", "true");
+ Awaitility.await().untilAsserted(()->{
+ assertTrue(conf.isForceDeleteTenantAllowed());
+ });
+ }
}