fix (#9526) Fix combineCQ extra search commitLog files for recovery

qianye1001 · web-flow · commit ecd78d9958e0 · 2025-07-08T14:10:13.000+08:00
Fix combineCQ extra search commitLog files for recovery
diff --git a/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java b/store/src/main/java/org/apache/rocketmq/store/queue/CombineConsumeQueueStore.java
@@ -153,7 +153,7 @@ public boolean isMappedFileMatchedRecover(long phyOffset, long storeTimestamp,
                 continue;
             }
             // if other store is not matched for fully recovery, extraSearchCommitLogFilesForRecovery will minus 1
-            if (extraSearchCommitLogFilesForRecovery.getAndIncrement() <= 0) {
+            if (extraSearchCommitLogFilesForRecovery.getAndDecrement() <= 0) {
                 // extraSearchCommitLogFilesForRecovery <= 0, only can read from assignOffsetStore
                 if (assignOffsetStore != currentReadStore) {
                     log.error("CombineConsumeQueueStore currentReadStore not satisfied readable conditions, assignOffsetStore={}, currentReadStore={}",

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public boolean isMappedFileMatchedRecover(long phyOffset, long storeTimestamp,`
`153`	`153`	`continue;`
`154`	`154`	`}`
`155`	`155`	`// if other store is not matched for fully recovery, extraSearchCommitLogFilesForRecovery will minus 1`
`156`		`- if (extraSearchCommitLogFilesForRecovery.getAndIncrement() <= 0) {`
	`156`	`+ if (extraSearchCommitLogFilesForRecovery.getAndDecrement() <= 0) {`
`157`	`157`	`// extraSearchCommitLogFilesForRecovery <= 0, only can read from assignOffsetStore`
`158`	`158`	`if (assignOffsetStore != currentReadStore) {`
`159`	`159`	`log.error("CombineConsumeQueueStore currentReadStore not satisfied readable conditions, assignOffsetStore={}, currentReadStore={}",`