diff --git a/conf/broker.conf b/conf/broker.conf index a543fa2db71c6..b0e7d8e2d5a60 100644 --- a/conf/broker.conf +++ b/conf/broker.conf @@ -390,9 +390,6 @@ unblockStuckSubscriptionEnabled=false # it uses more CPU to perform frequent check. (Disable publish throttling with value 0) topicPublisherThrottlingTickTimeMillis=10 -# Enable precise rate limit for topic publish -preciseTopicPublishRateLimiterEnable=false - # Tick time to schedule task that checks broker publish rate limiting across all topics # Reducing to lower value can give more accuracy while throttling publish but # it uses more CPU to perform frequent check. (Disable publish throttling with value 0) diff --git a/conf/standalone.conf b/conf/standalone.conf index ee2d9732bdf7a..40b88d185c517 100644 --- a/conf/standalone.conf +++ b/conf/standalone.conf @@ -260,9 +260,6 @@ keySharedLookAheadMsgInReplayThresholdPerSubscription=20000 # it uses more CPU to perform frequent check. (Disable publish throttling with value 0) topicPublisherThrottlingTickTimeMillis=2 -# Enable precise rate limit for topic publish -preciseTopicPublishRateLimiterEnable=false - # Tick time to schedule task that checks broker publish rate limiting across all topics # Reducing to lower value can give more accuracy while throttling publish but # it uses more CPU to perform frequent check. (Disable publish throttling with value 0) 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 ca4408aa4e7c0..2b30baa62a2d2 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 @@ -1037,11 +1037,6 @@ The max allowed delay for delayed delivery (in milliseconds). If the broker rece + "it uses more CPU to perform frequent check. (Disable publish throttling with value 0)" ) private int topicPublisherThrottlingTickTimeMillis = 10; - @FieldContext( - category = CATEGORY_SERVER, - doc = "Enable precise rate limit for topic publish" - ) - private boolean preciseTopicPublishRateLimiterEnable = false; @FieldContext( category = CATEGORY_SERVER, diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java index f6397f2196281..fdefd81aea02f 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java @@ -135,8 +135,6 @@ public abstract class AbstractTopic implements Topic, TopicPolicyListener { protected volatile PublishRateLimiter topicPublishRateLimiter; protected volatile ResourceGroupPublishLimiter resourceGroupPublishLimiter; - protected boolean preciseTopicPublishRateLimitingEnable; - @Getter protected boolean resourceGroupRateLimitingEnabled; @@ -193,7 +191,6 @@ public AbstractTopic(String topic, BrokerService brokerService) { updateTopicPolicyByBrokerConfig(); this.lastActive = System.nanoTime(); - this.preciseTopicPublishRateLimitingEnable = config.isPreciseTopicPublishRateLimiterEnable(); topicPublishRateLimiter = new PublishRateLimiterImpl(brokerService.getPulsar().getMonotonicClock()); updateActiveRateLimiters(); 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 107bb01ffa0ce..8007a2e9a79f8 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 @@ -324,7 +324,6 @@ public class BrokerService implements Closeable { private Channel listenChannel; private Channel listenChannelTls; - private boolean preciseTopicPublishRateLimitingEnable; private BrokerInterceptor interceptor; private final EntryFilterProvider entryFilterProvider; private TopicFactory topicFactory; @@ -340,8 +339,6 @@ public BrokerService(PulsarService pulsar, EventLoopGroup eventLoopGroup) throws this.clock = pulsar.getClock(); this.dynamicConfigurationMap = prepareDynamicConfigurationMap(); this.brokerPublishRateLimiter = new PublishRateLimiterImpl(pulsar.getMonotonicClock()); - this.preciseTopicPublishRateLimitingEnable = - pulsar.getConfiguration().isPreciseTopicPublishRateLimiterEnable(); this.dispatchRateLimiterFactory = createDispatchRateLimiterFactory(pulsar.getConfig()); this.managedLedgerStorage = pulsar.getManagedLedgerStorage(); this.keepAliveIntervalSeconds = pulsar.getConfiguration().getKeepAliveIntervalSeconds(); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPublishRateThrottleTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPublishRateThrottleTest.java index e251e244a83f0..86b040567062e 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPublishRateThrottleTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPublishRateThrottleTest.java @@ -48,7 +48,6 @@ protected void cleanup() throws Exception { @Test public void testProducerBlockedByPrecisTopicPublishRateLimiting() throws Exception { PublishRate publishRate = new PublishRate(1,10); - conf.setPreciseTopicPublishRateLimiterEnable(true); conf.setMaxPendingPublishRequestsPerConnection(0); super.baseSetup(); admin.namespaces().setPublishRate("prop/ns-abc", publishRate); @@ -92,7 +91,6 @@ public void testSystemTopicPublishNonBlock() throws Exception { @Test public void testPrecisTopicPublishRateLimitingProduceRefresh() throws Exception { PublishRate publishRate = new PublishRate(1,10); - conf.setPreciseTopicPublishRateLimiterEnable(true); conf.setMaxPendingPublishRequestsPerConnection(0); super.baseSetup(); admin.namespaces().setPublishRate("prop/ns-abc", publishRate); @@ -126,7 +124,6 @@ public void testPrecisTopicPublishRateLimitingProduceRefresh() throws Exception @Test public void testBrokerLevelPublishRateDynamicUpdate() throws Exception{ - conf.setPreciseTopicPublishRateLimiterEnable(true); conf.setMaxPendingPublishRequestsPerConnection(0); super.baseSetup(); final String topic = "persistent://prop/ns-abc/testMultiLevelPublishRate";