[rocketmq] branch develop updated: [ISSUE #5390] not to print some useless log in PopReviveService (#5391)

[kaili]

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

kaili pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 40013b32e [ISSUE #5390] not to print some useless log in 
PopReviveService (#5391)
40013b32e is described below

commit 40013b32e818cf47607e48f9bb0553c14d24d948
Author: lk <xdk...@outlook.com>
AuthorDate: Tue Oct 25 10:10:34 2022 +0800

    [ISSUE #5390] not to print some useless log in PopReviveService (#5391)
---
 .../rocketmq/broker/processor/PopReviveService.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
index 68dece009..1db958e55 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/processor/PopReviveService.java
@@ -159,7 +159,9 @@ public class PopReviveService extends ServiceThread {
             return null;
         }
         if (reachTail(pullResult, offset)) {
-            POP_LOGGER.info("reviveQueueId={}, reach tail,offset {}", queueId, 
offset);
+            if (this.brokerController.getBrokerConfig().isEnablePopLog()) {
+                POP_LOGGER.info("reviveQueueId={}, reach tail,offset {}", 
queueId, offset);
+            }
         } else if (pullResult.getPullStatus() == PullStatus.OFFSET_ILLEGAL || 
pullResult.getPullStatus() == PullStatus.NO_MATCHED_MSG) {
             POP_LOGGER.error("reviveQueueId={}, OFFSET_ILLEGAL {}, result is 
{}", queueId, offset, pullResult);
             if (!shouldRunPopRevive) {
@@ -209,12 +211,15 @@ public class PopReviveService extends ServiceThread {
                 case NO_MATCHED_LOGIC_QUEUE:
                 case OFFSET_FOUND_NULL:
                 case OFFSET_OVERFLOW_BADLY:
-                case OFFSET_OVERFLOW_ONE:
                 case OFFSET_TOO_SMALL:
                     pullStatus = PullStatus.OFFSET_ILLEGAL;
                     POP_LOGGER.warn("offset illegal. GetMessageStatus={}, 
topic={}, groupId={}, requestOffset={}",
                         getMessageResult.getStatus(), topic, group, offset);
                     break;
+                case OFFSET_OVERFLOW_ONE:
+                    // no need to print WARN, because we use "offset + 1" to 
get the next message
+                    pullStatus = PullStatus.OFFSET_ILLEGAL;
+                    break;
                 default:
                     assert false;
                     break;
@@ -286,8 +291,10 @@ public class PopReviveService extends ServiceThread {
                 if (endTime != 0 && System.currentTimeMillis() - endTime > 3 * 
PopAckConstants.SECOND && timerDelay <= 0 && commitLogDelay <= 0) {
                     endTime = System.currentTimeMillis();
                 }
-                POP_LOGGER.info("reviveQueueId={}, offset is {}, can not get 
new msg, old endTime {}, new endTime {}",
-                    queueId, offset, old, endTime);
+                if (this.brokerController.getBrokerConfig().isEnablePopLog()) {
+                    POP_LOGGER.info("reviveQueueId={}, offset is {}, can not 
get new msg, old endTime {}, new endTime {}",
+                        queueId, offset, old, endTime);
+                }
                 if (endTime - firstRt > PopAckConstants.ackTimeInterval + 
PopAckConstants.SECOND) {
                     break;
                 }