Merge pull request #13398 from giuseppe/fix-warning-pod-create-rm

libpod: drop warning if cgroup doesn't exist
This commit is contained in:
OpenShift Merge Robot 2022-03-22 15:56:45 +01:00 committed by GitHub
commit b4b8b8b537
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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)
}
}