fix(region): container exited status checking (#21347)

yunionio · Oct 5, 2024 · 5a5631a · 5a5631a
1 parent 2e7b443
commit 5a5631a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/compute/models/containers.go b/pkg/compute/models/containers.go
@@ -361,8 +361,8 @@ func (c *SContainer) StartCreateTask(ctx context.Context, userCred mcclient.Toke
 }
 
 func (c *SContainer) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input *api.ContainerUpdateInput) (*api.ContainerUpdateInput, error) {
-	if c.GetStatus() != api.CONTAINER_STATUS_EXITED {
-		return nil, httperrors.NewInvalidStatusError("current status %s is not %s", c.GetStatus(), api.CONTAINER_STATUS_EXITED)
+	if !api.ContainerExitedStatus.Has(c.GetStatus()) {
+		return nil, httperrors.NewInvalidStatusError("current status %s is not in %v", c.GetStatus(), api.ContainerExitedStatus.List())
 	}
 
 	baseInput, err := c.SVirtualResourceBase.ValidateUpdateData(ctx, userCred, query, input.VirtualResourceBaseUpdateInput)

diff --git a/pkg/compute/tasks/pod_stop_task.go b/pkg/compute/tasks/pod_stop_task.go
@@ -51,7 +51,7 @@ func (t *PodStopTask) OnWaitContainerStopped(ctx context.Context, pod *models.SG
 	for i := range ctrs {
 		curCtr := ctrs[i]
 		log.Infof("========container status: %s", curCtr.GetStatus())
-		if curCtr.GetStatus() != api.CONTAINER_STATUS_EXITED {
+		if !api.ContainerExitedStatus.Has(curCtr.GetStatus()) {
 			isAllStopped = false
 			curCtr.StartStopTask(ctx, t.GetUserCred(), &api.ContainerStopInput{
 				Timeout: 1,