From 3047cf2fe1e075fc44b6f4718697ef8c63c3a11c Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Tue, 14 Jan 2025 01:15:39 +0800 Subject: [PATCH] fix: cleanup inprocess task on service restart (#21961) Co-authored-by: Qiu Jian --- pkg/cloudcommon/db/taskman/taskarchive.go | 1 + pkg/cloudcommon/db/taskman/tasks.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cloudcommon/db/taskman/taskarchive.go b/pkg/cloudcommon/db/taskman/taskarchive.go index 17c4a2e2d1..dd62d2ac69 100644 --- a/pkg/cloudcommon/db/taskman/taskarchive.go +++ b/pkg/cloudcommon/db/taskman/taskarchive.go @@ -71,6 +71,7 @@ func (manager *SArchivedTaskManager) NamespaceScope() rbacscope.TRbacScope { func (manager *SArchivedTaskManager) Insert(ctx context.Context, task *STask) error { archivedTask := SArchivedTask{} + archivedTask.SetModelManager(manager, &archivedTask) archivedTask.TaskId = task.Id archivedTask.STaskBase = task.STaskBase archivedTask.ObjIds = TaskObjectManager.GetObjectIds(task) diff --git a/pkg/cloudcommon/db/taskman/tasks.go b/pkg/cloudcommon/db/taskman/tasks.go index b249dfc9f9..22644ccf5d 100644 --- a/pkg/cloudcommon/db/taskman/tasks.go +++ b/pkg/cloudcommon/db/taskman/tasks.go @@ -1274,14 +1274,14 @@ func (manager *STaskManager) InitializeData() error { func (manager *STaskManager) failTimeoutTasks() error { // failed unfinished tasks 24 hours ago q := manager.Query().NotIn("stage", []string{TASK_STAGE_FAILED, TASK_STAGE_COMPLETE}) - q = q.LT("created_at", time.Now().Add(-24*time.Hour)) + // q = q.LT("created_at", time.Now().Add(-24*time.Hour)) tasks := make([]STask, 0) err := db.FetchModelObjects(manager, q, &tasks) if err != nil { return errors.Wrap(err, "FetchModelObjects") } - reason := jsonutils.NewString("service restart and the task timeout(more than 24hour)") + reason := jsonutils.NewString("service restart") for i := range tasks { tasks[i].SetStageFailed(context.Background(), reason) }