fix: slave delete all topic config and subGroup config when sync config from master

humkum · humkum · commit 60f356d1252c · 2026-01-08T11:08:44.000+08:00
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java b/broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java
@@ -94,8 +94,8 @@ private void syncTopicConfig() {
                         Map.Entry<String, TopicConfig> entry = iterator.next();
                         if (!newTopicConfigTable.containsKey(entry.getKey())) {
                             iterator.remove();
+                            topicConfigManager.deleteTopicConfig(entry.getKey());
                         }
-                        topicConfigManager.deleteTopicConfig(entry.getKey());
                     }
 
                     //update
@@ -189,8 +189,8 @@ private void syncSubscriptionGroupConfig() {
                         Map.Entry<String, SubscriptionGroupConfig> configEntry = iterator.next();
                         if (!newSubscriptionGroupTable.containsKey(configEntry.getKey())) {
                             iterator.remove();
+                            subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());
                         }
-                        subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());
                     }
                     // update
                     newSubscriptionGroupTable.values().forEach(subscriptionGroupManager::putSubscriptionGroupConfig);

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ private void syncTopicConfig() {`
`94`	`94`	`Map.Entry<String, TopicConfig> entry = iterator.next();`
`95`	`95`	`if (!newTopicConfigTable.containsKey(entry.getKey())) {`
`96`	`96`	`iterator.remove();`
	`97`	`+ topicConfigManager.deleteTopicConfig(entry.getKey());`
`97`	`98`	`}`
`98`		`- topicConfigManager.deleteTopicConfig(entry.getKey());`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`//update`
`@@ -189,8 +189,8 @@ private void syncSubscriptionGroupConfig() {`
`189`	`189`	`Map.Entry<String, SubscriptionGroupConfig> configEntry = iterator.next();`
`190`	`190`	`if (!newSubscriptionGroupTable.containsKey(configEntry.getKey())) {`
`191`	`191`	`iterator.remove();`
	`192`	`+ subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());`
`192`	`193`	`}`
`193`		`- subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());`
`194`	`194`	`}`
`195`	`195`	`// update`
`196`	`196`	`newSubscriptionGroupTable.values().forEach(subscriptionGroupManager::putSubscriptionGroupConfig);`