go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc changes 

Make a few nit changes to cgroups
Better OOM watcher debug logging

PiperOrigin-RevId: 429183470
This commit is contained in:
Fabricio Voznika 2022-02-16 17:49:02 -08:00 committed by gVisor bot
parent 0b86ae090e
commit 81ea55d8fc
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/shim/oom_v2.go
View File

@ -65,15 +65,17 @@ func (w *watcherV2) run(ctx context.Context) {
return
case i := <-w.itemCh:
if i.err != nil {
logrus.WithError(i.err).Debugf("Error listening for OOM, id: %q", i.id)
delete(lastOOMMap, i.id)
continue
}
logrus.Debugf("Received OOM event, id: %q, event: %+v", i.id, i.ev)
lastOOM := lastOOMMap[i.id]
if i.ev.OOM > lastOOM {
if err := w.publisher.Publish(ctx, runtime.TaskOOMEventTopic, &TaskOOM{
ContainerID: i.id,
}); err != nil {
logrus.WithError(err).Error("publish OOM event")
logrus.WithError(err).Error("Publish OOM event")
}
}
if i.ev.OOM > 0 {
@ -89,8 +91,9 @@ func (w *watcherV2) add(id string, cgx interface{}) error {
if !ok {
return fmt.Errorf("expected *cgroupsv2.Manager, got: %T", cgx)
}
// NOTE: containerd/cgroups/v2 does not support closing eventCh routine currently.
// The routine shuts down when an error happens, mostly when the cgroup is deleted.
// NOTE: containerd/cgroups/v2 does not support closing eventCh routine
// currently. The routine shuts down when an error happens, mostly when the
// cgroup is deleted.
eventCh, errCh := cg.EventChan()
go func() {
for {

44
runsc/cgroup/cgroup_v2.go
View File

@ -74,29 +74,16 @@ type cgroupV2 struct {
}
func newCgroupV2(mountpoint string, group string) (*cgroupV2, error) {
cg := &cgroupV2{
Mountpoint: mountpoint,
Path: group,
}
err := cg.setupControllers()
return cg, err
}
// setupControllers setup all supported controllers based on cgroup.controllers
// in the unified cgroup mount point
func (c *cgroupV2) setupControllers() error {
if c.Controllers != nil {
return nil
}
data, err := ioutil.ReadFile(filepath.Join(c.Mountpoint, "cgroup.controllers"))
data, err := ioutil.ReadFile(filepath.Join(mountpoint, "cgroup.controllers"))
if err != nil {
return err
return nil, err
}
fields := strings.Fields(string(data))
c.Controllers = fields
return nil
return &cgroupV2{
Mountpoint: mountpoint,
Path: group,
Controllers: strings.Fields(string(data)),
}, nil
}
// Install creates and configures cgroups.
@ -179,7 +166,7 @@ func (c *cgroupV2) Uninstall() error {
defer cancel()
b := backoff.WithContext(backoff.NewConstantBackOff(100*time.Millisecond), ctx)
// delete last entry in owned first
// Deletion must occur reverse order, because they may contain ancestors.
for i := len(c.Own) - 1; i >= 0; i-- {
current := c.Own[i]
log.Debugf("Removing cgroup for path=%q", current)
@ -207,7 +194,8 @@ func (c *cgroupV2) Join() (func(), error) {
if err != nil {
return nil, err
}
// since this is unified, get the first path of current process's cgroup is enough
// Since this is unified, get the first path of current process's cgroup is
// enough.
undoPath := filepath.Join(c.Mountpoint, paths[cgroup2Key])
cu := cleanup.Make(func() {
@ -390,8 +378,8 @@ func (*memory2) set(spec *specs.LinuxResources, path string) error {
if spec.Memory.Swap != nil {
// in cgroup v2, we set memory and swap separately, but the spec specifies
// Swap field as memory+swap, so we need memory limit here to be set in order
// to get the correct swap value
// Swap field as memory+swap, so we need memory limit here to be set in
// order to get the correct swap value.
if spec.Memory.Limit == nil {
return errors.New("cgroup: Memory.Swap is set without Memory.Limit")
}
@ -571,8 +559,9 @@ func convertCPUSharesToCgroupV2Value(cpuShares uint64) uint64 {
}
// convertMemorySwapToCgroupV2Value converts MemorySwap value from OCI spec
// for use by cgroup v2 drivers. A conversion is needed since Resources.MemorySwap
// is defined as memory+swap combined, while in cgroup v2 swap is a separate value.
// for use by cgroup v2 drivers. A conversion is needed since
// Resources.MemorySwap is defined as memory+swap combined, while in cgroup v2
// swap is a separate value.
func convertMemorySwapToCgroupV2Value(memorySwap, memory int64) (int64, error) {
// for compatibility with cgroup1 controller, set swap to unlimited in
// case the memory is set to unlimited, and swap is not explicitly set,
@ -640,7 +629,8 @@ func bfqDeviceWeightSupported(bfq *os.File) bool {
if _, err := bfq.Read(buf); err != nil {
return false
}
// If only a single number (default weight) if read back, we have older kernel.
// If only a single number (default weight) if read back, we have older
// kernel.
_, err := strconv.ParseInt(string(bytes.TrimSpace(buf)), 10, 64)
return err != nil
}