Skip to content

Commit 7d5ae9b

Browse files
Fix topic deletion issue in master-slave clusters
1 parent 236ede2 commit 7d5ae9b

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

broker/src/main/java/org/apache/rocketmq/broker/slave/SlaveSynchronize.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ private void syncTopicConfig() {
9393
while (iterator.hasNext()) {
9494
Map.Entry<String, TopicConfig> entry = iterator.next();
9595
if (!newTopicConfigTable.containsKey(entry.getKey())) {
96-
iterator.remove();
96+
iterator.remove();
97+
topicConfigManager.deleteTopicConfig(entry.getKey());
9798
}
98-
topicConfigManager.deleteTopicConfig(entry.getKey());
9999
}
100100

101101
//update
@@ -188,9 +188,9 @@ private void syncSubscriptionGroupConfig() {
188188
while (iterator.hasNext()) {
189189
Map.Entry<String, SubscriptionGroupConfig> configEntry = iterator.next();
190190
if (!newSubscriptionGroupTable.containsKey(configEntry.getKey())) {
191-
iterator.remove();
191+
iterator.remove();
192+
subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());
192193
}
193-
subscriptionGroupManager.deleteSubscriptionGroupConfig(configEntry.getKey());
194194
}
195195
// update
196196
newSubscriptionGroupTable.values().forEach(subscriptionGroupManager::putSubscriptionGroupConfig);

0 commit comments

Comments
 (0)