[cherry-pick][branch-2.10]Add fix cherry-pick apache#17907 duplicated…

… configuration.
datastax · Dec 7, 2022 · e4e7321 · e4e7321
1 parent 0705547
commit e4e7321
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git 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
@@ -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;