Skip to content

fix:implement workflow task cancellation before deletion in DeleteWorkflowV4 function. #4617

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
lilianzhu merged 1 commit into from
Apr 27, 2026
Merged

fix:implement workflow task cancellation before deletion in DeleteWorkflowV4 function. #4617

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
15 changes: 15 additions & 0 deletions pkg/microservice/aslan/core/workflow/service/workflow/workflow_v4.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import (
commonservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/collaboration"
helmservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/helm"
runtimeWorkflowController "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/workflowcontroller"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/kube"
larkservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/lark"
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/s3"
Expand Down Expand Up @@ -305,6 +306,20 @@ func FindWorkflowV4Raw(name string, logger *zap.SugaredLogger) (*commonmodels.Wo
}

func DeleteWorkflowV4(name string, logger *zap.SugaredLogger) error {
// Cancel any queued or running tasks before deleting the workflow.
taskQueue, err := commonrepo.NewWorkflowQueueColl().List(&commonrepo.ListWorfklowQueueOption{
WorkflowName: name,
})
if err != nil {
logger.Errorf("Failed to list queued tasks for workflow %s, the error is: %v", name, err)
return e.ErrDeleteWorkflow.AddErr(err)
}
for _, task := range taskQueue {
if err := runtimeWorkflowController.CancelWorkflowTask("system", task.WorkflowName, task.TaskID, logger); err != nil {
logger.Warnf("Failed to cancel task %d for workflow %s before deletion, the error is: %v", task.TaskID, name, err)
}
}

workflow, err := commonrepo.NewWorkflowV4Coll().Find(name)
if err != nil {
logger.Errorf("Failed to delete WorkflowV4: %s, the error is: %v", name, err)
Expand Down
Loading