fix(region): server-purge failed on pod (#21789)

yunionio · Dec 12, 2024 · c1610ce · c1610ce
1 parent 0cdbc21
commit c1610ce
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/pkg/compute/models/containers.go b/pkg/compute/models/containers.go
@@ -595,12 +595,14 @@ func (c *SContainer) StartSyncStatusTask(ctx context.Context, userCred mcclient.
 }
 
 func (c *SContainer) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query, data jsonutils.JSONObject) error {
-	return c.StartDeleteTask(ctx, userCred, "")
+	return c.StartDeleteTask(ctx, userCred, "", jsonutils.QueryBoolean(data, "purge", false))
 }
 
-func (c *SContainer) StartDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
+func (c *SContainer) StartDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, purge bool) error {
 	c.SetStatus(ctx, userCred, api.CONTAINER_STATUS_DELETING, "")
-	task, err := taskman.TaskManager.NewTask(ctx, "ContainerDeleteTask", c, userCred, nil, parentTaskId, "", nil)
+	task, err := taskman.TaskManager.NewTask(ctx, "ContainerDeleteTask", c, userCred, jsonutils.Marshal(map[string]interface{}{
+		"purge": purge,
+	}).(*jsonutils.JSONDict), parentTaskId, "", nil)
 	if err != nil {
 		return errors.Wrap(err, "NewTask")
 	}

diff --git a/pkg/compute/tasks/container_delete_task.go b/pkg/compute/tasks/container_delete_task.go
@@ -40,15 +40,21 @@ func (t *ContainerDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneMode
 }
 
 func (t *ContainerDeleteTask) requestDelete(ctx context.Context, container *models.SContainer) {
+	isPurge := jsonutils.QueryBoolean(t.GetParams(), "purge", false)
 	t.SetStage("OnDeleted", nil)
-	if err := t.GetPodDriver().RequestDeleteContainer(ctx, t.GetUserCred(), t); err != nil {
-		if strings.Contains(err.Error(), "NotFoundError") {
-			// already deleted
-			t.OnDeleted(ctx, container, nil)
+	if isPurge {
+		t.ScheduleRun(nil)
+		return
+	} else {
+		if err := t.GetPodDriver().RequestDeleteContainer(ctx, t.GetUserCred(), t); err != nil {
+			if strings.Contains(err.Error(), "NotFoundError") {
+				// already deleted
+				t.OnDeleted(ctx, container, nil)
+				return
+			}
+			t.OnDeleteFailed(ctx, container, jsonutils.NewString(err.Error()))
 			return
 		}
-		t.OnDeleteFailed(ctx, container, jsonutils.NewString(err.Error()))
-		return
 	}
 }
 

diff --git a/pkg/compute/tasks/pod_delete_task.go b/pkg/compute/tasks/pod_delete_task.go
@@ -57,7 +57,7 @@ func (t *PodDeleteTask) OnWaitContainerDeleted(ctx context.Context, pod *models.
 		return
 	}
 	curCtr := ctrs[0]
-	curCtr.StartDeleteTask(ctx, t.GetUserCred(), t.GetTaskId())
+	curCtr.StartDeleteTask(ctx, t.GetUserCred(), t.GetTaskId(), jsonutils.QueryBoolean(t.GetParams(), "purge", false))
 }
 
 func (t *PodDeleteTask) OnWaitContainerDeletedFailed(ctx context.Context, pod *models.SGuest, data jsonutils.JSONObject) {