From 4fff7bccdd0d3f051539cb47b3c5aa30cccc9d7a Mon Sep 17 00:00:00 2001
From: ssongliu <sloooop1x@gmail.com>
Date: Fri, 9 Oct 2026 18:19:35 +0800
Subject: [PATCH] refactor(redis): retain existing task execution flow

---
 agent/app/service/container.go |  7 +------
 agent/app/task/task.go         | 17 +----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/agent/app/service/container.go b/agent/app/service/container.go
index ab9a674aa..d65ef4f1f 100644
--- a/agent/app/service/container.go
+++ b/agent/app/service/container.go
@@ -558,15 +558,10 @@ func (u *ContainerService) ContainerCreate(req dto.ContainerOperate, inThread bo
 	}, nil)
 
 	if inThread {
-		if err := taskItem.Prepare(); err != nil {
-			unlock()
-			_ = client.Close()
-			return err
-		}
 		go func() {
 			defer unlock()
 			defer client.Close()
-			if err := taskItem.ExecutePrepared(); err != nil {
+			if err := taskItem.Execute(); err != nil {
 				global.LOG.Error(err.Error())
 			}
 		}()
diff --git a/agent/app/task/task.go b/agent/app/task/task.go
index 0ccd97c59..62614ccc0 100644
--- a/agent/app/task/task.go
+++ b/agent/app/task/task.go
@@ -284,25 +284,10 @@ func (t *Task) updateTask(task *model.Task) {
 	_ = t.taskRepo.Update(context.Background(), task)
 }
 
-// Prepare makes a task visible before dispatching it to a background worker.
-func (t *Task) Prepare() error {
-	if err := t.taskRepo.Save(context.Background(), t.Task); err != nil {
-		_ = t.logFile.Close()
-		global.RemoveTaskCancel(t.TaskID)
-		return err
-	}
-	return nil
-}
-
 func (t *Task) Execute() error {
-	if err := t.Prepare(); err != nil {
+	if err := t.taskRepo.Save(context.Background(), t.Task); err != nil {
 		return err
 	}
-	return t.ExecutePrepared()
-}
-
-// ExecutePrepared runs a task after the caller has successfully called Prepare.
-func (t *Task) ExecutePrepared() error {
 	var err error
 	t.Log(i18n.GetWithName("TaskStart", t.Name))
 	for i := 0; i < len(t.SubTasks); i++ {