opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 15:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10427 from rhatdan/errors

Browse Source 
Drop container does not exist on removal to debugf
This commit is contained in:
OpenShift Merge Robot
2021-05-21 19:39:21 +02:00
committed by GitHub
parent 6a6ef402c3 6ca721cccd
commit 7f4afe45ab
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/domain/infra/abi/containers.go
View File

@ -275,7 +275,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
case nil: case nil:
// remove container names that we successfully deleted // remove container names that we successfully deleted
reports = append(reports, &report) reports = append(reports, &report)
case define.ErrNoSuchCtr: case define.ErrNoSuchCtr, define.ErrCtrExists:
// There is still a potential this is a libpod container // There is still a potential this is a libpod container
tmpNames = append(tmpNames, ctr) tmpNames = append(tmpNames, ctr)
default: default:

13
pkg/domain/infra/tunnel/containers.go
View File

@ -21,6 +21,7 @@ import (
"github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/podman/v3/pkg/errorhandling"
"github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/specgen"
"github.com/containers/podman/v3/pkg/util" "github.com/containers/podman/v3/pkg/util"
"github.com/containers/storage/types"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -580,7 +581,7 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
if err := containers.Remove(ic.ClientCtx, ctr.ID, removeOptions); err != nil { if err := containers.Remove(ic.ClientCtx, ctr.ID, removeOptions); err != nil {
if errorhandling.Contains(err, define.ErrNoSuchCtr) || if errorhandling.Contains(err, define.ErrNoSuchCtr) ||
errorhandling.Contains(err, define.ErrCtrRemoved) { errorhandling.Contains(err, define.ErrCtrRemoved) {
logrus.Warnf("Container %s does not exist: %v", ctr.ID, err) logrus.Debugf("Container %s does not exist: %v", ctr.ID, err)
} else { } else {
logrus.Errorf("Error removing container %s: %v", ctr.ID, err) logrus.Errorf("Error removing container %s: %v", ctr.ID, err)
} }
@ -613,8 +614,9 @@ func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []stri
rmOptions := new(containers.RemoveOptions).WithForce(false).WithVolumes(true) rmOptions := new(containers.RemoveOptions).WithForce(false).WithVolumes(true)
if err := containers.Remove(ic.ClientCtx, ctr.ID, rmOptions); err != nil { if err := containers.Remove(ic.ClientCtx, ctr.ID, rmOptions); err != nil {
if errorhandling.Contains(err, define.ErrNoSuchCtr) || if errorhandling.Contains(err, define.ErrNoSuchCtr) ||
errorhandling.Contains(err, define.ErrCtrRemoved) { errorhandling.Contains(err, define.ErrCtrRemoved) ||
logrus.Warnf("Container %s does not exist: %v", ctr.ID, err) errorhandling.Contains(err, types.ErrLayerUnknown) {
logrus.Debugf("Container %s does not exist: %v", ctr.ID, err)
} else { } else {
logrus.Errorf("Error removing container %s: %v", ctr.ID, err) logrus.Errorf("Error removing container %s: %v", ctr.ID, err)
} }
@ -691,8 +693,9 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
if !shouldRestart { if !shouldRestart {
if err := containers.Remove(ic.ClientCtx, con.ID, new(containers.RemoveOptions).WithForce(false).WithVolumes(true)); err != nil { if err := containers.Remove(ic.ClientCtx, con.ID, new(containers.RemoveOptions).WithForce(false).WithVolumes(true)); err != nil {
if errorhandling.Contains(err, define.ErrNoSuchCtr) || if errorhandling.Contains(err, define.ErrNoSuchCtr) ||
errorhandling.Contains(err, define.ErrCtrRemoved) { errorhandling.Contains(err, define.ErrCtrRemoved) ||
logrus.Warnf("Container %s does not exist: %v", con.ID, err) errorhandling.Contains(err, types.ErrLayerUnknown) {
logrus.Debugf("Container %s does not exist: %v", con.ID, err)
} else { } else {
logrus.Errorf("Error removing container %s: %v", con.ID, err) logrus.Errorf("Error removing container %s: %v", con.ID, err)
} }