(rocketmq) branch develop updated: [ISSUE #10195] Ensure RocksDB compatibility in slave-master synchronization (#10196)

[lizhimin]

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

lizhimin 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 8d451f3334 [ISSUE #10195] Ensure RocksDB compatibility in slave-master 
synchronization (#10196)
8d451f3334 is described below

commit 8d451f33341d5adeda9ec0da72ba26a3481ec39d
Author: gaoyf <ga...@users.noreply.github.com>
AuthorDate: Tue Mar 24 16:58:17 2026 +0800

    [ISSUE #10195] Ensure RocksDB compatibility in slave-master synchronization 
(#10196)
---
 .../apache/rocketmq/broker/subscription/SubscriptionGroupManager.java   | 2 +-
 .../main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java
 
b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java
index e860f29074..5850309e8c 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java
@@ -323,7 +323,7 @@ public class SubscriptionGroupManager extends ConfigManager 
{
         int maxGroupNum) {
         // [groupSeq, groupSeq + maxGroupNum)
         int beginIndex = groupSeq;
-        if (StringUtils.isBlank(dataVersion) || 
!Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), 
this.dataVersion)) {
+        if (beginIndex != 0 && (StringUtils.isBlank(dataVersion) || 
!Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), 
getDataVersion()))) {
             beginIndex = 0;
             log.info("get sub subscription group table from {} due to {}", 
beginIndex,
                 StringUtils.isBlank(dataVersion) ? "DataVersion Empty" : 
"DataVersion Changed");
diff --git 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index 51b5f5492a..e4e97b83c2 100644
--- 
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++ 
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -725,7 +725,7 @@ public class TopicConfigManager extends ConfigManager {
         int maxTopicNum) {
         // [topicSeq, topicSeq + maxTopicNum)
         int beginIndex = topicSeq;
-        if (StringUtils.isBlank(dataVersion) || 
!Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), 
this.dataVersion)) {
+        if (beginIndex != 0 && (StringUtils.isBlank(dataVersion) || 
!Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), 
getDataVersion()))) {
             beginIndex = 0;
             log.info("get sub topic config table from {} due to {}", 
beginIndex,
                 StringUtils.isBlank(dataVersion) ? "DataVersion Empty" : 
"DataVersion Changed");