Skip to content

Commit 8d451f3

Browse files
authored
[ISSUE #10195] Ensure RocksDB compatibility in slave-master synchronization (#10196)
1 parent e100743 commit 8d451f3

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public ConcurrentHashMap<String, SubscriptionGroupConfig> subGroupTable(String d
323323
int maxGroupNum) {
324324
// [groupSeq, groupSeq + maxGroupNum)
325325
int beginIndex = groupSeq;
326-
if (StringUtils.isBlank(dataVersion) || !Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), this.dataVersion)) {
326+
if (beginIndex != 0 && (StringUtils.isBlank(dataVersion) || !Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), getDataVersion()))) {
327327
beginIndex = 0;
328328
log.info("get sub subscription group table from {} due to {}", beginIndex,
329329
StringUtils.isBlank(dataVersion) ? "DataVersion Empty" : "DataVersion Changed");

broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ public ConcurrentHashMap<String, TopicConfig> subTopicConfigTable(String dataVer
725725
int maxTopicNum) {
726726
// [topicSeq, topicSeq + maxTopicNum)
727727
int beginIndex = topicSeq;
728-
if (StringUtils.isBlank(dataVersion) || !Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), this.dataVersion)) {
728+
if (beginIndex != 0 && (StringUtils.isBlank(dataVersion) || !Objects.equals(DataVersion.fromJson(dataVersion, DataVersion.class), getDataVersion()))) {
729729
beginIndex = 0;
730730
log.info("get sub topic config table from {} due to {}", beginIndex,
731731
StringUtils.isBlank(dataVersion) ? "DataVersion Empty" : "DataVersion Changed");

0 commit comments

Comments
 (0)