diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-13 20:23:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 20:23:21 +0200 |
| commit | 25415e0b0edb0f120cedcc10b9aed7f15cd9e086 (patch) | |
| tree | 72719f434fabfb1cf7b76772df6a7371f4b39f9d /vendor/github.com/containerd/cgroups/paths.go | |
| parent | e0f123056581e399b6c0d0282462164d8b8957c5 (diff) | |
| parent | 60d43effb017e0e0f6475b48ea8efe3e8ad0448a (diff) | |
| download | podman-25415e0b0edb0f120cedcc10b9aed7f15cd9e086.tar.gz podman-25415e0b0edb0f120cedcc10b9aed7f15cd9e086.tar.bz2 podman-25415e0b0edb0f120cedcc10b9aed7f15cd9e086.zip | |
Merge pull request #3103 from mheon/update_cgroups
Update containerd/cgroups to 4994991857f9b0ae
Diffstat (limited to 'vendor/github.com/containerd/cgroups/paths.go')
| -rw-r--r-- | vendor/github.com/containerd/cgroups/paths.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/github.com/containerd/cgroups/paths.go b/vendor/github.com/containerd/cgroups/paths.go index 455ce857f..f45fd4256 100644 --- a/vendor/github.com/containerd/cgroups/paths.go +++ b/vendor/github.com/containerd/cgroups/paths.go @@ -57,6 +57,9 @@ func PidPath(pid int) Path { return existingPath(paths, "") } +// ErrControllerNotActive is returned when a controller is not supported or enabled +var ErrControllerNotActive = errors.New("controller is not supported") + func existingPath(paths map[string]string, suffix string) Path { // localize the paths based on the root mount dest for nested cgroups for n, p := range paths { @@ -77,7 +80,7 @@ func existingPath(paths map[string]string, suffix string) Path { root, ok := paths[string(name)] if !ok { if root, ok = paths[fmt.Sprintf("name=%s", name)]; !ok { - return "", fmt.Errorf("unable to find %q in controller set", name) + return "", ErrControllerNotActive } } if suffix != "" { |