(inlong) branch master updated: [INLONG-12104][Manager] Fix failure to logically delete associated data (#12105)

[vernedeng]

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

vernedeng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 944c333726 [INLONG-12104][Manager] Fix failure to logically delete 
associated data (#12105)
944c333726 is described below

commit 944c333726729405cee5606fbf536de4bb7f203a
Author: flowers-59f <115353281+flowers-...@users.noreply.github.com>
AuthorDate: Sun May 10 22:28:07 2026 +0800

    [INLONG-12104][Manager] Fix failure to logically delete associated data 
(#12105)
---
 .../manager/service/group/InlongGroupServiceImpl.java   | 17 ++++++++---------
 .../listener/group/UpdateGroupCompleteListener.java     |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
index 7428c342bd..30fb1f67d1 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
@@ -668,15 +668,6 @@ public class InlongGroupServiceImpl implements 
InlongGroupService {
             streamService.logicDeleteAll(groupId, operator);
         }
 
-        entity.setIsDeleted(entity.getId());
-        entity.setStatus(GroupStatus.CONFIG_DELETED.getCode());
-        entity.setModifier(operator);
-        int rowCount = groupMapper.updateByIdentifierSelective(entity);
-        if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
-            LOGGER.error("inlong group has already updated for groupId={} 
curVersion={}", groupId, entity.getVersion());
-            throw new BusinessException(ErrorCodeEnum.CONFIG_EXPIRED);
-        }
-
         // logically delete the associated extension info
         groupExtMapper.logicDeleteAllByGroupId(groupId);
 
@@ -689,6 +680,14 @@ public class InlongGroupServiceImpl implements 
InlongGroupService {
             }
         }
 
+        entity.setIsDeleted(entity.getId());
+        entity.setModifier(operator);
+        int rowCount = groupMapper.updateByIdentifierSelective(entity);
+        if (rowCount != InlongConstants.AFFECTED_ONE_ROW) {
+            LOGGER.error("inlong group has already updated for groupId={} 
curVersion={}", groupId, entity.getVersion());
+            throw new BusinessException(ErrorCodeEnum.CONFIG_EXPIRED);
+        }
+
         LOGGER.info("success to delete group and group ext property for 
groupId={} by user={}", groupId, operator);
         return true;
     }
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
index 1a6e1f7fe1..e8c365957f 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
@@ -88,6 +88,7 @@ public class UpdateGroupCompleteListener implements 
ProcessEventListener {
                 break;
             case DELETE:
                 // delete process completed, then delete the group info
+                groupService.updateStatus(groupId, 
GroupStatus.CONFIG_DELETED.getCode(), operator);
                 groupService.delete(groupId, operator);
                 break;
             default: