diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-13 18:44:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 18:44:45 +0200 |
| commit | e8a44ebd460a2cc2d499b02cb4e0f699a9965b85 (patch) | |
| tree | f0ee4571f9a471bade27557a52def7100a4a9284 /pkg/varlinkapi/containers.go | |
| parent | 7875e00c663a42dd26c99889206cdb8f16ff0905 (diff) | |
| parent | 88ebc33840ff07701254e2f6e2484f229f09a6cc (diff) | |
| download | podman-e8a44ebd460a2cc2d499b02cb4e0f699a9965b85.tar.gz podman-e8a44ebd460a2cc2d499b02cb4e0f699a9965b85.tar.bz2 podman-e8a44ebd460a2cc2d499b02cb4e0f699a9965b85.zip | |
Merge pull request #4006 from rhatdan/rootless
Report errors when trying to pause rootless containers
Diffstat (limited to 'pkg/varlinkapi/containers.go')
| -rw-r--r-- | pkg/varlinkapi/containers.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 2dcdbc089..93f9d4fe3 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -319,12 +319,14 @@ func (i *LibpodAPI) ExportContainer(call iopodman.VarlinkCall, name, outPath str // GetContainerStats ... func (i *LibpodAPI) GetContainerStats(call iopodman.VarlinkCall, name string) error { - cgroupv2, err := cgroups.IsCgroup2UnifiedMode() - if err != nil { - return call.ReplyErrorOccurred(err.Error()) - } - if rootless.IsRootless() && !cgroupv2 { - return call.ReplyErrRequiresCgroupsV2ForRootless("rootless containers cannot report container stats") + if rootless.IsRootless() { + cgroupv2, err := cgroups.IsCgroup2UnifiedMode() + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + if !cgroupv2 { + return call.ReplyErrRequiresCgroupsV2ForRootless("rootless containers cannot report container stats") + } } ctr, err := i.Runtime.LookupContainer(name) if err != nil { |