diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-12 21:09:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 21:09:26 +0200 |
| commit | 3cf4567e1dfcf172673694a1171ae18bcbf9c846 (patch) | |
| tree | c548449339f9f2affdb043c1fcce55d2fb5c79ac /pkg | |
| parent | 9bee6907a5d867ab866374c6c7d8a45e3fa705da (diff) | |
| parent | 55cc80d3c9bfd96225db179b96427aa377ecb9dc (diff) | |
| download | podman-3cf4567e1dfcf172673694a1171ae18bcbf9c846.tar.gz podman-3cf4567e1dfcf172673694a1171ae18bcbf9c846.tar.bz2 podman-3cf4567e1dfcf172673694a1171ae18bcbf9c846.zip | |
Merge pull request #3753 from baude/varlinkrequiresroot
varlink endpoint for containerstats requires root
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/containers.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index bb66ff962..c7aa5233f 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -19,6 +19,8 @@ import ( "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/logs" "github.com/containers/libpod/pkg/adapter/shortcuts" + "github.com/containers/libpod/pkg/cgroups" + "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/varlinkapi/virtwriter" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" @@ -317,6 +319,13 @@ 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") + } ctr, err := i.Runtime.LookupContainer(name) if err != nil { return call.ReplyContainerNotFound(name, err.Error()) |