You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by te...@apache.org on 2023/06/14 02:01:10 UTC
[pulsar] branch master updated: [fix][broker] new load balancer system topic should not be auto-created now (#20566)
This is an automated email from the ASF dual-hosted git repository.
technoboy 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 441d0ef15a4 [fix][broker] new load balancer system topic should not be auto-created now (#20566)
441d0ef15a4 is described below
commit 441d0ef15a498f69ef5fe2341953c3a360a56cf0
Author: Heesung Sohn <10...@users.noreply.github.com>
AuthorDate: Tue Jun 13 19:01:02 2023 -0700
[fix][broker] new load balancer system topic should not be auto-created now (#20566)
---
.../java/org/apache/pulsar/broker/service/BrokerService.java | 12 +++++++++++-
.../org/apache/pulsar/broker/service/BrokerServiceTest.java | 11 ++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 39635fa6735..2aba9adbb89 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -100,6 +100,7 @@ import org.apache.pulsar.broker.delayed.DelayedDeliveryTrackerLoader;
import org.apache.pulsar.broker.intercept.BrokerInterceptor;
import org.apache.pulsar.broker.intercept.ManagedLedgerInterceptorImpl;
import org.apache.pulsar.broker.loadbalance.LoadManager;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateChannelImpl;
import org.apache.pulsar.broker.namespace.NamespaceService;
import org.apache.pulsar.broker.resources.DynamicConfigurationResources;
import org.apache.pulsar.broker.resources.LocalPoliciesResources;
@@ -3304,10 +3305,19 @@ public class BrokerService implements Closeable {
topicName.getNamespaceObject());
return CompletableFuture.completedFuture(false);
}
- //System topic can always be created automatically
+
+ // ServiceUnitStateChannelImpl.TOPIC expects to be a non-partitioned-topic now.
+ // We don't allow the auto-creation here.
+ // ServiceUnitStateChannelImpl.start() is responsible to create the topic.
+ if (ServiceUnitStateChannelImpl.TOPIC.equals(topicName.toString())) {
+ return CompletableFuture.completedFuture(false);
+ }
+
+ //Other system topics can be created automatically
if (pulsar.getConfiguration().isSystemTopicEnabled() && isSystemTopic(topicName)) {
return CompletableFuture.completedFuture(true);
}
+
final boolean allowed;
AutoTopicCreationOverride autoTopicCreationOverride = getAutoTopicCreationOverride(topicName, policies);
if (autoTopicCreationOverride != null) {
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 d0c128eb899..9bc78de8337 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
@@ -74,6 +74,7 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.pulsar.broker.PulsarService;
+import org.apache.pulsar.broker.loadbalance.extensions.channel.ServiceUnitStateChannelImpl;
import org.apache.pulsar.broker.namespace.NamespaceService;
import org.apache.pulsar.broker.service.BrokerServiceException.PersistenceException;
import org.apache.pulsar.broker.service.persistent.PersistentTopic;
@@ -1579,7 +1580,6 @@ public class BrokerServiceTest extends BrokerTestBase {
});
}
-
// this test is disabled since it is flaky
@Test(enabled = false)
public void testBrokerStatsTopicLoadFailed() throws Exception {
@@ -1657,4 +1657,13 @@ public class BrokerServiceTest extends BrokerTestBase {
return flag.get();
});
}
+
+ @Test
+ public void testIsSystemTopicAllowAutoTopicCreationAsync() throws Exception {
+ BrokerService brokerService = pulsar.getBrokerService();
+ assertFalse(brokerService.isAllowAutoTopicCreationAsync(
+ ServiceUnitStateChannelImpl.TOPIC).get());
+ assertTrue(brokerService.isAllowAutoTopicCreationAsync(
+ "persistent://pulsar/system/my-system-topic").get());
+ }
}