github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4340 from AkihiroSuda/fix-4312

Browse Source 
decrease log level of cgroup2 ToggleController error when running in UserNS
This commit is contained in:
Michael Crosby 2020-06-24 15:45:37 -04:00 committed by GitHub
commit 492c014136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/v2/runc/v2/service.go
View File

@ -46,6 +46,7 @@ import (
"github.com/containerd/containerd/runtime/v2/runc/options" "github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/runtime/v2/shim"
taskAPI "github.com/containerd/containerd/runtime/v2/task" taskAPI "github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/sys/reaper" "github.com/containerd/containerd/sys/reaper"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/typeurl" "github.com/containerd/typeurl"
@ -360,9 +361,13 @@ func (s *service) Start(ctx context.Context, r *taskAPI.StartRequest) (*taskAPI.
logrus.WithError(err).Error("failed to get root controllers") logrus.WithError(err).Error("failed to get root controllers")
} else { } else {
if err := cg.ToggleControllers(allControllers, cgroupsv2.Enable); err != nil { if err := cg.ToggleControllers(allControllers, cgroupsv2.Enable); err != nil {
if sys.RunningInUserNS() {
logrus.WithError(err).Debugf("failed to enable controllers (%v)", allControllers)
} else {
logrus.WithError(err).Errorf("failed to enable controllers (%v)", allControllers) logrus.WithError(err).Errorf("failed to enable controllers (%v)", allControllers)
} }
} }
}
if err := s.ep.Add(container.ID, cg); err != nil { if err := s.ep.Add(container.ID, cg); err != nil {
logrus.WithError(err).Error("add cg to OOM monitor") logrus.WithError(err).Error("add cg to OOM monitor")
} }