diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2020-10-27 19:44:41 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-27 19:46:51 -0700 |
| commit | 93d2d37a93640328f01add7d4866bc107ff6a74e (patch) | |
| tree | d43c71ac644f90b526b735d549a0f0dffaaf0a88 /runsc/cgroup/cgroup.go | |
| parent | 035b1c8272b2a26f96bf4ad04330e04dba2f8ff6 (diff) | |
Add more cgroup unit tests
PiperOrigin-RevId: 339380431
Diffstat (limited to 'runsc/cgroup/cgroup.go')
| -rw-r--r-- | runsc/cgroup/cgroup.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runsc/cgroup/cgroup.go b/runsc/cgroup/cgroup.go index 56da21584..5bd0afc52 100644 --- a/runsc/cgroup/cgroup.go +++ b/runsc/cgroup/cgroup.go @@ -21,6 +21,7 @@ import ( "context" "errors" "fmt" + "io" "io/ioutil" "os" "path/filepath" @@ -198,8 +199,13 @@ func LoadPaths(pid string) (map[string]string, error) { } defer f.Close() + return loadPathsHelper(f) +} + +func loadPathsHelper(cgroup io.Reader) (map[string]string, error) { paths := make(map[string]string) - scanner := bufio.NewScanner(f) + + scanner := bufio.NewScanner(cgroup) for scanner.Scan() { // Format: ID:[name=]controller1,controller2:path // Example: 2:cpu,cpuacct:/user.slice @@ -207,6 +213,9 @@ func LoadPaths(pid string) (map[string]string, error) { if len(tokens) != 3 { return nil, fmt.Errorf("invalid cgroups file, line: %q", scanner.Text()) } + if len(tokens[1]) == 0 { + continue + } for _, ctrlr := range strings.Split(tokens[1], ",") { // Remove prefix for cgroups with no controller, eg. systemd. ctrlr = strings.TrimPrefix(ctrlr, "name=") |