Skip to content

[INLONG-12104][Manager] Fix failure to logically delete associated data for data flow groups #12105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flowers-59f wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

[INLONG-12104][Manager] Fix failure to logically delete associated data for data flow groups #12105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions ...service/src/main/java/org/apache/inlong/manager/service/group/InlongGroupServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,15 +668,6 @@ public Boolean delete(String groupId, String operator) {
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);

Expand All @@ -689,6 +680,14 @@ public Boolean delete(String groupId, String operator) {
}
}

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;
}
Expand Down
1 change: 1 addition & 0 deletions ...in/java/org/apache/inlong/manager/service/listener/group/UpdateGroupCompleteListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public ListenerResult listen(WorkflowContext context) {
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:
Expand Down
Loading