This is an automated email from the ASF dual-hosted git repository.
ayegorov 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 0cfed948301 [fix] chore: remove unused
preciseTopicPublishRateLimiterEnable (#24249)
0cfed948301 is described below
commit 0cfed9483012e6f0b693312c3d1dae03c78b368c
Author: Andrey Yegorov <[email protected]>
AuthorDate: Mon May 5 15:36:37 2025 -0700
[fix] chore: remove unused preciseTopicPublishRateLimiterEnable (#24249)
---
conf/broker.conf | 3 ---
conf/standalone.conf | 3 ---
.../src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java | 5 -----
.../main/java/org/apache/pulsar/broker/service/AbstractTopic.java | 3 ---
.../main/java/org/apache/pulsar/broker/service/BrokerService.java | 3 ---
.../apache/pulsar/broker/service/TopicPublishRateThrottleTest.java | 3 ---
6 files changed, 20 deletions(-)
diff --git a/conf/broker.conf b/conf/broker.conf
index c26899f6e42..f28564a1543 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -393,9 +393,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 ee2d9732bdf..40b88d185c5 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 3226c1bbbce..f2ab111bb84 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
@@ -1041,11 +1041,6 @@ public class ServiceConfiguration implements
PulsarConfiguration {
+ "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 e1e37ea2420..2eea0775058 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 abstract class AbstractTopic implements Topic,
TopicPolicyListener {
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 e9d82abde36..236c6e4ddea 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
@@ -323,7 +323,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;
@@ -339,8 +338,6 @@ public class BrokerService implements Closeable {
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 e580d478b1c..fe3b5de27cc 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
@@ -47,7 +47,6 @@ public class TopicPublishRateThrottleTest extends
BrokerTestBase{
@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);
@@ -93,7 +92,6 @@ public class TopicPublishRateThrottleTest extends
BrokerTestBase{
@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);
@@ -129,7 +127,6 @@ public class TopicPublishRateThrottleTest extends
BrokerTestBase{
@Test
public void testBrokerLevelPublishRateDynamicUpdate() throws Exception{
- conf.setPreciseTopicPublishRateLimiterEnable(true);
conf.setMaxPendingPublishRequestsPerConnection(0);
super.baseSetup();
final String topic =
"persistent://prop/ns-abc/testMultiLevelPublishRate";
