[rocketmq] branch develop updated: [ISSUE #2133] Fix RMQ_SYS_TRANS_OP_HALF_TOPIC be deleted when deleting topic/group

[ji...@apache.org]

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

jinrongtong 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 8b63761  [ISSUE #2133] Fix RMQ_SYS_TRANS_OP_HALF_TOPIC be deleted when deleting topic/group
8b63761 is described below

commit 8b63761f535ed1f6be3ccf1c5dff3ea761c46e92
Author: huangli <ar...@gmail.com>
AuthorDate: Mon Jan 18 19:47:17 2021 +0800

    [ISSUE #2133] Fix RMQ_SYS_TRANS_OP_HALF_TOPIC be deleted when deleting topic/group
---
 store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
index 89e2cc0..eff4677 100644
--- a/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
+++ b/store/src/main/java/org/apache/rocketmq/store/DefaultMessageStore.java
@@ -1030,7 +1030,8 @@ public class DefaultMessageStore implements MessageStore {
             Entry<String, ConcurrentMap<Integer, ConsumeQueue>> next = it.next();
             String topic = next.getKey();
 
-            if (!topics.contains(topic) && !topic.equals(TopicValidator.RMQ_SYS_SCHEDULE_TOPIC)) {
+            if (!topics.contains(topic) && !topic.equals(TopicValidator.RMQ_SYS_SCHEDULE_TOPIC)
+                    && !topic.equals(TopicValidator.RMQ_SYS_TRANS_OP_HALF_TOPIC)) {
                 ConcurrentMap<Integer, ConsumeQueue> queueTable = next.getValue();
                 for (ConsumeQueue cq : queueTable.values()) {
                     cq.destroy();