This is an automated email from the ASF dual-hosted git repository.
lizhimins pushed a commit to branch rocketmq-studio
in repository https://gitbox.apache.org/repos/asf/rocketmq-dashboard.git
The following commit(s) were added to refs/heads/rocketmq-studio by this push:
new bd652417 fix(rocketmq): scope topic deletion to the current cluster
(#1150)
bd652417 is described below
commit bd652417b58cf82a6b1d1d1626be96333bd3e1a3
Author: 0 <[email protected]>
AuthorDate: Fri Aug 7 16:11:04 2026 +0800
fix(rocketmq): scope topic deletion to the current cluster (#1150)
---
.../rocketmq/studio/provider/apache/RocketMQAdminClientImpl.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git
a/server/src/main/java/org/apache/rocketmq/studio/provider/apache/RocketMQAdminClientImpl.java
b/server/src/main/java/org/apache/rocketmq/studio/provider/apache/RocketMQAdminClientImpl.java
index 34939d5b..cef97703 100644
---
a/server/src/main/java/org/apache/rocketmq/studio/provider/apache/RocketMQAdminClientImpl.java
+++
b/server/src/main/java/org/apache/rocketmq/studio/provider/apache/RocketMQAdminClientImpl.java
@@ -291,8 +291,11 @@ public class RocketMQAdminClientImpl implements
AdminClient {
}
admin.deleteTopicInNameServer(nsAddrs, getClusterName(admin),
name);
- // Delete from DB
- topicMapper.delete(new
LambdaQueryWrapper<RmqTopic>().eq(RmqTopic::getName, name));
+ // Delete from DB, scoped to the current cluster so same-named
topics in other
+ // clusters are not removed.
+ topicMapper.delete(new LambdaQueryWrapper<RmqTopic>()
+ .eq(RmqTopic::getClusterId, getClusterName(admin))
+ .eq(RmqTopic::getName, name));
recordAudit("DELETE_TOPIC", name, "", "SUCCESS");
return null;