Rename configuration property that uses msgInReplay concept

conf/broker.conf

@@ -359,20 +359,20 @@ maxUnackedMessagesPerSubscriptionOnBrokerBlocked=0.16
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more
 # messages from the backlog and attempt to dispatch them to consumers until the number of replay
 # messages reaches the calculated threshold.
-# Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *
-# connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription).
+# Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *
+# connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription).
 # Setting this value to 0 will disable the limit calculated per consumer.
-keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer=1000
+keySharedLookAheadMsgInReplayThresholdPerConsumer=1000
 
 # For Key_Shared subscriptions, if messages cannot be dispatched to consumers due to a slow consumer
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more
 # messages from the backlog and attempt to dispatch them to consumers until the number of replay
 # messages reaches the calculated threshold.
-# Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *
-# connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription).
+# Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *
+# connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription).
 # This value should be set to a value less than 2 * managedLedgerMaxUnackedRangesToPersist.
 # Setting this value to 0 will disable the limit calculated per subscription.
-keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription=10000
+keySharedLookAheadMsgInReplayThresholdPerSubscription=10000
 
 # For Key_Shared subscriptions, if messages cannot be dispatched to consumers due to a slow consumer
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more

conf/standalone.conf

@@ -236,20 +236,20 @@ maxUnackedMessagesPerSubscriptionOnBrokerBlocked=0.16
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more
 # messages from the backlog and attempt to dispatch them to consumers until the number of replay
 # messages reaches the calculated threshold.
-# Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *
-# connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription).
+# Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *
+# connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription).
 # Setting this value to 0 will disable the limit calculated per consumer.
-keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer=1000
+keySharedLookAheadMsgInReplayThresholdPerConsumer=1000
 
 # For Key_Shared subscriptions, if messages cannot be dispatched to consumers due to a slow consumer
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more
 # messages from the backlog and attempt to dispatch them to consumers until the number of replay
 # messages reaches the calculated threshold.
-# Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *
-# connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription).
+# Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *
+# connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription).
 # This value should be set to a value less than 2 * managedLedgerMaxUnackedRangesToPersist.
 # Setting this value to 0 will disable the limit calculated per subscription.
-keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription=10000
+keySharedLookAheadMsgInReplayThresholdPerSubscription=10000
 
 # For Key_Shared subscriptions, if messages cannot be dispatched to consumers due to a slow consumer
 # or a blocked key hash (because of ordering constraints), the broker will continue reading more

pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java

@@ -954,28 +954,28 @@ The max allowed delay for delayed delivery (in milliseconds). If the broker rece
                     + " or a blocked key hash (because of ordering constraints), the broker will continue reading more"
                     + " messages from the backlog and attempt to dispatch them to consumers until the number of replay"
                     + " messages reaches the calculated threshold.\n"
-                    + "Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *"
-                    + " connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription)"
+                    + "Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *"
+                    + " connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription)"
                     + ".\n"
                     + "Setting this value to 0 will disable the limit calculated per consumer.",
             dynamic = true
     )
-    private int keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer = 1000;
+    private int keySharedLookAheadMsgInReplayThresholdPerConsumer = 1000;
 
     @FieldContext(
             category = CATEGORY_POLICIES,
             doc = "For Key_Shared subscriptions, if messages cannot be dispatched to consumers due to a slow consumer"
                     + " or a blocked key hash (because of ordering constraints), the broker will continue reading more"
                     + " messages from the backlog and attempt to dispatch them to consumers until the number of replay"
                     + " messages reaches the calculated threshold.\n"
-                    + "Formula: threshold = max(keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer *"
-                    + " connected consumer count, keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription)"
+                    + "Formula: threshold = max(keySharedLookAheadMsgInReplayThresholdPerConsumer *"
+                    + " connected consumer count, keySharedLookAheadMsgInReplayThresholdPerSubscription)"
                     + ".\n"
                     + "This value should be set to a value less than 2 * managedLedgerMaxUnackedRangesToPersist.\n"
                     + "Setting this value to 0 will disable the limit calculated per subscription.\n",
             dynamic = true
     )
-    private int keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription = 10000;
+    private int keySharedLookAheadMsgInReplayThresholdPerSubscription = 10000;
 
 
     @FieldContext(

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java

@@ -383,9 +383,9 @@ private boolean isLookAheadAllowed() {
         if (serviceConfig.isKeySharedLookAheadEnabledWhenRecentlyJoinedConsumersExist()
                 || (recentlyJoinedConsumers == null || recentlyJoinedConsumers.isEmpty())) {
             long keySharedNumberOfReplayMessagesThresholdForLookAhead = Math.max(
-                    serviceConfig.getKeySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer()
+                    serviceConfig.getKeySharedLookAheadMsgInReplayThresholdPerConsumer()
                             * consumerList.size(),
-                    serviceConfig.getKeySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription());
+                    serviceConfig.getKeySharedLookAheadMsgInReplayThresholdPerSubscription());
             if (keySharedNumberOfReplayMessagesThresholdForLookAhead == 0
                     || redeliveryMessages.size() < keySharedNumberOfReplayMessagesThresholdForLookAhead) {
                 return true;
@@ -607,8 +607,8 @@ private synchronized Position updateIfNeededAndGetLastSentPosition() {
      * limits kick in), instead of keep replaying the same old messages, since the consumer that these
      * messages are routing to might be busy at the moment.
      *
-     * Please see {@link ServiceConfiguration#keySharedLookAheadNumberOfReplayMessagesThresholdPerConsumer},
-     * {@link ServiceConfiguration#keySharedLookAheadNumberOfReplayMessagesThresholdPerSubscription} and
+     * Please see {@link ServiceConfiguration#keySharedLookAheadMsgInReplayThresholdPerConsumer},
+     * {@link ServiceConfiguration#keySharedLookAheadMsgInReplayThresholdPerSubscription} and
      * {@link ServiceConfiguration#keySharedLookAheadEnabledWhenRecentlyJoinedConsumersExist} for configuring
      * the limits.
      */