Optimize RocksDB CQ shutdown when using DoubleWriteCQ #9212

qianye1001 · RongtongJin · commit 7f80aeaaecd5 · 2025-07-19T18:17:56.000+08:00
diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -517,7 +517,7 @@ public void shutdown() {
             if (this.compactionService != null) {
                 this.compactionService.shutdown();
             }
-            if (messageStoreConfig.isRocksdbCQDoubleWriteEnable() && this.rocksDBMessageStore != null) {
+            if (this.rocksDBMessageStore != null && this.rocksDBMessageStore.consumeQueueStore != null) {
                 this.rocksDBMessageStore.consumeQueueStore.shutdown();
             }
             this.flushConsumeQueueService.shutdown();

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ public void shutdown() {`
`517`	`517`	`if (this.compactionService != null) {`
`518`	`518`	`this.compactionService.shutdown();`
`519`	`519`	`}`
`520`		`- if (messageStoreConfig.isRocksdbCQDoubleWriteEnable() && this.rocksDBMessageStore != null) {`
	`520`	`+ if (this.rocksDBMessageStore != null && this.rocksDBMessageStore.consumeQueueStore != null) {`
`521`	`521`	`this.rocksDBMessageStore.consumeQueueStore.shutdown();`
`522`	`522`	`}`
`523`	`523`	`this.flushConsumeQueueService.shutdown();`