diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-25 11:59:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-25 11:59:09 +0100 |
| commit | 12f73d5f88d8646058bbb4e673b04b413732dbe2 (patch) | |
| tree | 479aaf581154a1b9b8fffa8f45473aa11e45929d /libpod/container_inspect.go | |
| parent | 93138541f3119b81c170e5ce904a8c4e6cece842 (diff) | |
| parent | e648122b2986ea3bdcee33ebaef8731e574e8f54 (diff) | |
| download | podman-12f73d5f88d8646058bbb4e673b04b413732dbe2.tar.gz podman-12f73d5f88d8646058bbb4e673b04b413732dbe2.tar.bz2 podman-12f73d5f88d8646058bbb4e673b04b413732dbe2.zip | |
Merge pull request #12403 from giuseppe/improve-cgroup-detection
libpod: improve heuristic to detect cgroup
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 76a08ce30..83b643266 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -97,6 +97,16 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver return nil, err } + cgroupPath, err := c.cGroupPath() + if err != nil { + // Handle the case where the container is not running or has no cgroup. + if errors.Is(err, define.ErrNoCgroups) || errors.Is(err, define.ErrCtrStopped) { + cgroupPath = "" + } else { + return nil, err + } + } + data := &define.InspectContainerData{ ID: config.ID, Created: config.CreatedTime, @@ -116,6 +126,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *define.Driver StartedAt: runtimeInfo.StartedTime, FinishedAt: runtimeInfo.FinishedTime, Checkpointed: runtimeInfo.Checkpointed, + CgroupPath: cgroupPath, }, Image: config.RootfsImageID, ImageName: config.RootfsImageName, |