opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-30 17:13:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: sync status stopped pod

Browse Source
This commit is contained in:
Qiu Jian
2024-04-03 07:59:19 +08:00
parent b193cc00cf
commit 772456bfe6
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pod.go
+10 -2
View File
@@ -551,7 +551,7 @@ func (s *sPodGuestInstance) StartContainer(ctx context.Context, userCred mcclien
if hasCtr {
status, err := s.getContainerStatus(ctx, ctrId)
if err != nil {
if strings.Contains(err.Error(), "not found") {
if errors.Cause(err) == errors.ErrNotFound {
needRecreate = true
} else {
return nil, errors.Wrap(err, "get container status")
@@ -611,13 +611,17 @@ func (s *sPodGuestInstance) doContainerStartPostLifecycle(ctx context.Context, c
func (s *sPodGuestInstance) StopContainer(ctx context.Context, userCred mcclient.TokenCredential, ctrId string, body jsonutils.JSONObject) (jsonutils.JSONObject, error) {
criId, err := s.getContainerCRIId(ctrId)
if err != nil {
if errors.Cause(err) == errors.ErrNotFound {
// cri id not found, should already stopped
return nil, nil
}
return nil, errors.Wrap(err, "get container cri id")
}
var timeout int64 = 0
if body.Contains("timeout") {
timeout, _ = body.Int("timeout")
}
if err := s.getCRI().StopContainer(context.Background(), criId, timeout); err != nil {
if err := s.getCRI().StopContainer(ctx, criId, timeout); err != nil {
return nil, errors.Wrap(err, "CRI.StopContainer")
}
return nil, nil
@@ -1017,6 +1021,10 @@ func (s *sPodGuestInstance) DeleteContainer(ctx context.Context, userCred mcclie
func (s *sPodGuestInstance) getContainerStatus(ctx context.Context, ctrId string) (string, error) {
criId, err := s.getContainerCRIId(ctrId)
if err != nil {
if errors.Cause(err) == errors.ErrNotFound {
// not found, already stopped
return computeapi.CONTAINER_STATUS_EXITED, nil
}
return "", errors.Wrapf(err, "get container cri_id by %s", ctrId)
}
resp, err := s.getCRI().ContainerStatus(ctx, criId)
pkg/util/pod/cpus.go
+3
View File
@@ -136,6 +136,9 @@ func (h *HostContainerCPU) DeleteContainer(ctrId string) {
}
func (h *HostContainerCPU) InsertContainer(ctrId string, ctrIdx int) {
if h.Containers == nil {
h.Containers = make(map[string][]*ContainerCPU)
}
if h.HasContainer(ctrId) {
h.Containers[ctrId] = append(h.Containers[ctrId], NewContainerCPU(ctrId, ctrIdx))
} else {