diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-22 15:56:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 15:56:45 +0100 |
| commit | b4b8b8b5374967f9a98aef6c9793c51342d54b9d (patch) | |
| tree | b10a53b49c8bbda1cfdd8f404a404502fa4dcc32 /libpod | |
| parent | 901066acd113ee3bea709cc558d86c4c438e2f67 (diff) | |
| parent | e71d497e7ca7d67c7648800d303b337c52044cae (diff) | |
| download | podman-b4b8b8b5374967f9a98aef6c9793c51342d54b9d.tar.gz podman-b4b8b8b5374967f9a98aef6c9793c51342d54b9d.tar.bz2 podman-b4b8b8b5374967f9a98aef6c9793c51342d54b9d.zip | |
Merge pull request #13398 from giuseppe/fix-warning-pod-create-rm
libpod: drop warning if cgroup doesn't exist
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_pod_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/runtime_pod_linux.go b/libpod/runtime_pod_linux.go index 230491c1a..2bbccfdf6 100644 --- a/libpod/runtime_pod_linux.go +++ b/libpod/runtime_pod_linux.go @@ -6,6 +6,7 @@ package libpod import ( "context" "fmt" + "os" "path" "path/filepath" "strings" @@ -239,7 +240,7 @@ func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool, // Don't try if we failed to retrieve the cgroup if err == nil { - if err := conmonCgroup.Update(resLimits); err != nil { + if err := conmonCgroup.Update(resLimits); err != nil && !os.IsNotExist(err) { logrus.Warnf("Error updating pod %s conmon cgroup PID limit: %v", p.ID(), err) } } |