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

fix(host): ignore NotFound error when doing some operation to container (#21354)

Browse Source
This commit is contained in:
Zexi Li
2024-10-07 23:05:36 +08:00
committed by GitHub
parent 060f6a65e8
commit 211a5de294
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pod.go
+8 -4
View File
@@ -991,7 +991,7 @@ func (s *sPodGuestInstance) StartContainer(ctx context.Context, userCred mcclien
if hasCtr {
status, _, err := s.getContainerStatus(ctx, ctrId)
if err != nil {
if errors.Cause(err) == errors.ErrNotFound || strings.Contains(err.Error(), "not found") {
if IsContainerNotFoundError(err) {
needRecreate = true
} else {
return nil, errors.Wrap(err, "get container status")
@@ -1128,7 +1128,11 @@ func (s *sPodGuestInstance) StopContainer(ctx context.Context, userCred mcclient
}
}
if err := s.getCRI().StopContainer(ctx, criId, timeout); err != nil {
return nil, errors.Wrap(err, "CRI.StopContainer")
if !IsContainerNotFoundError(err) {
return nil, errors.Wrap(err, "CRI.StopContainer")
} else {
log.Warningf("CRI.StopContainer %s not found", criId)
}
}
if err := s.startStat.RemoveContainerFile(ctrId); err != nil {
return nil, errors.Wrap(err, "startStat.RemoveContainerFile")
@@ -1745,7 +1749,7 @@ func (s *sPodGuestInstance) DeleteContainer(ctx context.Context, userCred mcclie
if criId != "" {
s.expectedStatus.RemoveContainer(criId)
if err := s.getCRI().RemoveContainer(ctx, criId); err != nil && !strings.Contains(err.Error(), "not found") {
if err := s.getCRI().RemoveContainer(ctx, criId); err != nil && !IsContainerNotFoundError(err) {
return nil, errors.Wrap(err, "cri.RemoveContainer")
}
}
@@ -1771,7 +1775,7 @@ func (s *sPodGuestInstance) getContainerStatus(ctx context.Context, ctrId string
}
resp, err := s.getCRI().ContainerStatus(ctx, criId)
if err != nil {
if strings.Contains(err.Error(), "NotFound") {
if IsContainerNotFoundError(err) {
return computeapi.CONTAINER_STATUS_EXITED, nil, nil
}
return "", nil, errors.Wrap(err, "cri.ContainerStatus")
pkg/hostman/guestman/pod_helper.go
+15
View File
@@ -33,6 +33,21 @@ import (
"yunion.io/x/onecloud/pkg/util/pod/nerdctl"
)
func IsContainerNotFoundError(err error) bool {
if errors.Cause(err) == errors.ErrNotFound {
return true
}
for _, errMsg := range []string{
"NotFound",
"not found",
} {
if strings.Contains(err.Error(), errMsg) {
return true
}
}
return false
}
func GetContainerdConnectionInfo() (string, string) {
addr := options.HostOptions.ContainerRuntimeEndpoint
addr = strings.TrimPrefix(addr, "unix://")