(pulsar) branch master updated: [fix] [broker] correct compaction phase one timeout meaning (#21908)

[yubiao]

This is an automated email from the ASF dual-hosted git repository.

yubiao 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 3fa85f038aa [fix] [broker] correct compaction phase one timeout 
meaning (#21908)
3fa85f038aa is described below

commit 3fa85f038aac0bb416d6821a61709adfdc1a1c49
Author: thetumbled <52550727+thetumb...@users.noreply.github.com>
AuthorDate: Mon Jan 22 15:19:12 2024 +0800

    [fix] [broker] correct compaction phase one timeout meaning (#21908)
    
    Correct the description of the config 
`brokerServiceCompactionPhaseOneLoopTimeInSeconds`
---
 conf/broker.conf                                                      | 4 ++--
 .../src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/broker.conf b/conf/broker.conf
index e4494be0666..dc76ef07c70 100644
--- a/conf/broker.conf
+++ b/conf/broker.conf
@@ -534,8 +534,8 @@ brokerServiceCompactionMonitorIntervalInSeconds=60
 # Using a value of 0, is disabling compression check.
 brokerServiceCompactionThresholdInBytes=0
 
-# Timeout for the compaction phase one loop.
-# If the execution time of the compaction phase one loop exceeds this time, 
the compaction will not proceed.
+# Timeout for each read request in the compaction phase one loop.
+# If the execution time of one single message read operation exceeds this 
time, the compaction will not proceed.
 brokerServiceCompactionPhaseOneLoopTimeInSeconds=30
 
 # Whether retain null-key message during topic compaction
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 117ccc9661f..547858f5b71 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
@@ -2803,8 +2803,8 @@ public class ServiceConfiguration implements 
PulsarConfiguration {
 
     @FieldContext(
             category = CATEGORY_SERVER,
-            doc = "Timeout for the compaction phase one loop, If the execution 
time of the compaction "
-                    + "phase one loop exceeds this time, the compaction will 
not proceed."
+            doc = "Timeout for each read request in the compaction phase one 
loop, If the execution time of one "
+                    + "single message read operation exceeds this time, the 
compaction will not proceed."
     )
     private long brokerServiceCompactionPhaseOneLoopTimeInSeconds = 30;