Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions conf/broker.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions conf/standalone.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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";
Expand Down
Loading