Skip to content

[Fix-7767]Task instance is not deleted while deleting the process instance #7768

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

Merged
caishunfeng merged 5 commits into from
Jan 3, 2022
Merged

[Fix-7767]Task instance is not deleted while deleting the process instance #7768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
633d429
fix bug_7767
SbloodyS Jan 1, 2022
bdf8c30
fix bug_7767
SbloodyS Jan 2, 2022
eb75f10
fix bug_7767
SbloodyS Jan 3, 2022
75b397e
fix bug_7767
SbloodyS Jan 3, 2022
8777507
fix bug_7767
SbloodyS Jan 3, 2022
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
1 change: 1 addition & 0 deletions ...rc/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ public Map<String, Object> deleteProcessInstanceById(User loginUser, long projec

processService.deleteAllSubWorkProcessByParentId(processInstanceId);
processService.deleteWorkProcessMapByParentId(processInstanceId);
processService.deleteWorkTaskInstanceByProcessInstanceId(processInstanceId);

if (delete > 0) {
putMsg(result, Status.SUCCESS);
Expand Down
19 changes: 19 additions & 0 deletions ...ler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,25 @@ public void removeTaskLogFile(Integer processInstanceId) {
}
}

/**
* recursive delete all task instance by process instance id
* @param processInstanceId
*/
public void deleteWorkTaskInstanceByProcessInstanceId(int processInstanceId) {
List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId);
if (CollectionUtils.isEmpty(taskInstanceList)) {
return;
}

List<Integer> taskInstanceIdList = new ArrayList<>();

for (TaskInstance taskInstance : taskInstanceList) {
taskInstanceIdList.add(taskInstance.getId());
}

taskInstanceMapper.deleteBatchIds(taskInstanceIdList);
}

/**
* recursive query sub process definition id by parent id.
*
Expand Down