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
commit e4e7321ed82a5a6d0e76e79a7cc931e200bc4beb Author: xiangying <[email protected]> AuthorDate: Wed Dec 7 15:11:48 2022 +0800 [cherry-pick][branch-2.10]Add fix cherry-pick #17907 duplicated configuration. --- conf/broker.conf | 6 ------ .../main/java/org/apache/pulsar/broker/ServiceConfiguration.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/conf/broker.conf b/conf/broker.conf index c89414c8afd..f9cdba25a32 100644 --- a/conf/broker.conf +++ b/conf/broker.conf @@ -533,12 +533,6 @@ isDelayedDeliveryDeliverAtTimeStrict=false # fixed delays in messages in a different way. delayedDeliveryFixedDelayDetectionLookahead=50000 -# Size of the lookahead window to use when detecting if all the messages in the topic -# have a fixed delay. -# Default is 50,000. Setting the lookahead window to 0 will disable the logic to handle -# fixed delays in messages in a different way. -delayedDeliveryFixedDelayDetectionLookahead=50000 - # Whether to enable acknowledge of batch local index. acknowledgmentAtBatchIndexLevelEnabled=false 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 7a770b4b85f..05a24166c88 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 @@ -331,12 +331,6 @@ public class ServiceConfiguration implements PulsarConfiguration { + "logic to handle fixed delays in messages in a different way.") private long delayedDeliveryFixedDelayDetectionLookahead = 50_000; - @FieldContext(category = CATEGORY_SERVER, doc = "Size of the lookahead window to use " - + "when detecting if all the messages in the topic have a fixed delay. " - + "Default is 50,000. Setting the lookahead window to 0 will disable the " - + "logic to handle fixed delays in messages in a different way.") - private long delayedDeliveryFixedDelayDetectionLookahead = 50_000; - @FieldContext(category = CATEGORY_SERVER, doc = "Whether to enable the acknowledge of batch local index") private boolean acknowledgmentAtBatchIndexLevelEnabled = false;
