opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Zexi Li
2024-10-05 18:00:00 +08:00
committed by GitHub
parent 2e7b443ddc
commit 5a5631a9a5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/containers.go
+2 -2
View File
@@ -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)
pkg/compute/tasks/pod_stop_task.go
+1 -1
View File
@@ -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,