Skip to content

Commit

Permalink
libct/cgroups: support Cgroups.Resources.Unified
Browse files Browse the repository at this point in the history
Add support for unified resource map (as per [1]), and add some test
cases for the new functionality.

[1] opencontainers/runtime-spec#1040

Signed-off-by: Kir Kolyshkin <[email protected]>
  • Loading branch information
kolyshkin committed Sep 24, 2020
1 parent 37f57a1 commit 7dcf0e8
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 2 deletions.
8 changes: 7 additions & 1 deletion fs/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,10 @@ func (m *manager) Apply(pid int) (err error) {
m.mu.Lock()
defer m.mu.Unlock()

var c = m.cgroups
c := m.cgroups
if c.Resources.Unified != nil {
return cgroups.ErrV1NoUnified
}

m.paths = make(map[string]string)
if c.Paths != nil {
Expand Down Expand Up @@ -309,6 +312,9 @@ func (m *manager) Set(container *configs.Config) error {
if m.cgroups != nil && m.cgroups.Paths != nil {
return nil
}
if container.Cgroups.Resources.Unified != nil {
return cgroups.ErrV1NoUnified
}

m.mu.Lock()
defer m.mu.Unlock()
Expand Down
33 changes: 33 additions & 0 deletions fs2/fs2.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,14 @@
package fs2

import (
"fmt"
"io/ioutil"
"os"
"path/filepath"
"strings"

"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fscommon"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -206,10 +209,40 @@ func (m *manager) Set(container *configs.Config) error {
if err := setFreezer(m.dirPath, container.Cgroups.Freezer); err != nil {
return err
}
if err := m.setUnified(container.Cgroups.Unified); err != nil {
return err
}
m.config = container.Cgroups
return nil
}

func (m *manager) setUnified(res map[string]string) error {
for k, v := range res {
if strings.Contains(k, "/") {
return fmt.Errorf("unified resource %q must be a file name (no slashes)", k)
}
if err := fscommon.WriteFile(m.dirPath, k, v); err != nil {
errC := errors.Cause(err)
// Check for both EPERM and ENOENT since O_CREAT is used by WriteFile.
if errors.Is(errC, os.ErrPermission) || errors.Is(errC, os.ErrNotExist) {
// Check if a controller is available,
// to give more specific error if not.
sk := strings.SplitN(k, ".", 2)
if len(sk) != 2 {
return fmt.Errorf("unified resource %q must be in the form CONTROLLER.PARAMETER", k)
}
c := sk[0]
if _, ok := m.controllers[c]; !ok && c != "cgroup" {
return fmt.Errorf("unified resource %q can't be set: controller %q not available", k, c)
}
}
return errors.Wrapf(err, "can't set unified resource %q", k)
}
}

return nil
}

func (m *manager) GetPaths() map[string]string {
paths := make(map[string]string, 1)
paths[""] = m.dirPath
Expand Down
7 changes: 7 additions & 0 deletions systemd/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ func (m *legacyManager) Apply(pid int) error {
properties []systemdDbus.Property
)

if c.Resources.Unified != nil {
return cgroups.ErrV1NoUnified
}

m.mu.Lock()
defer m.mu.Unlock()
if c.Paths != nil {
Expand Down Expand Up @@ -342,6 +346,9 @@ func (m *legacyManager) Set(container *configs.Config) error {
if m.cgroups.Paths != nil {
return nil
}
if container.Cgroups.Resources.Unified != nil {
return cgroups.ErrV1NoUnified
}
dbusConnection, err := getDbusConnection(false)
if err != nil {
return err
Expand Down
3 changes: 2 additions & 1 deletion v1_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ const (
)

var (
errUnified = errors.New("not implemented for cgroup v2 unified hierarchy")
errUnified = errors.New("not implemented for cgroup v2 unified hierarchy")
ErrV1NoUnified = errors.New("invalid configuration: cannot use unified on cgroup v1")
)

type NotFoundError struct {
Expand Down

0 comments on commit 7dcf0e8

Please sign in to comment.