[rocketmq] branch develop updated: [ISSUE #7013] Polish ColdDataCheckService's logic (#7014)

[jinrongtong]

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

jinrongtong 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 1f0f3b2d6d [ISSUE #7013] Polish ColdDataCheckService's logic (#7014)
1f0f3b2d6d is described below

commit 1f0f3b2d6d16de7b315c702d33f7d3557c0fc25c
Author: Ji Juntao <juntao....@alibaba-inc.com>
AuthorDate: Tue Jul 11 21:13:06 2023 +0800

    [ISSUE #7013] Polish ColdDataCheckService's logic (#7014)
    
    * polish coldCtrl
    
    * remove the catch.
---
 store/src/main/java/org/apache/rocketmq/store/CommitLog.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java 
b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
index 5a5c90c5a0..e6ee3bacc1 100644
--- a/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
+++ b/store/src/main/java/org/apache/rocketmq/store/CommitLog.java
@@ -2089,6 +2089,11 @@ public class CommitLog implements Swappable {
                     } else {
                         
this.waitForRunning(defaultMessageStore.getMessageStoreConfig().getTimerColdDataCheckIntervalMs());
                     }
+
+                    if (pageSize < 0) {
+                        initPageSize();
+                    }
+
                     long beginClockTimestamp = this.systemClock.now();
                     scanFilesInPageCache();
                     long costTime = this.systemClock.now() - 
beginClockTimestamp;
@@ -2182,7 +2187,7 @@ public class CommitLog implements Swappable {
         }
 
         private void initPageSize() {
-            if (pageSize < 0) {
+            if (pageSize < 0 && 
defaultMessageStore.getMessageStoreConfig().isColdDataFlowControlEnable()) {
                 try {
                     if (!MixAll.isWindows()) {
                         pageSize = LibC.INSTANCE.getpagesize();