Skip to content

Commit

Permalink
Merge pull request #13398 from giuseppe/fix-warning-pod-create-rm
Browse files Browse the repository at this point in the history
libpod: drop warning if cgroup doesn't exist
  • Loading branch information
openshift-merge-robot authored Mar 22, 2022
2 parents 901066a + e71d497 commit b4b8b8b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion libpod/runtime_pod_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package libpod
import (
"context"
"fmt"
"os"
"path"
"path/filepath"
"strings"
Expand Down Expand Up @@ -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)
}
}
Expand Down

0 comments on commit b4b8b8b

Please sign in to comment.