diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-21 15:58:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 15:58:07 +0000 |
| commit | 79eb467325dc8ff50fecce1f69b17181168fb945 (patch) | |
| tree | 32441312c4f21a1461feceb7361025fc7595b6a5 /pkg/api/handlers/compat/containers_stats.go | |
| parent | 1cf19843d0f6b36597ac1537cc730069282e7353 (diff) | |
| parent | 1f539a26417bf5e76604361c1ea2841941809359 (diff) | |
| download | podman-79eb467325dc8ff50fecce1f69b17181168fb945.tar.gz podman-79eb467325dc8ff50fecce1f69b17181168fb945.tar.bz2 podman-79eb467325dc8ff50fecce1f69b17181168fb945.zip | |
Merge pull request #14677 from giuseppe/memory-limit-ctr-handlers
api: show the memory limit specified for the container
Diffstat (limited to 'pkg/api/handlers/compat/containers_stats.go')
| -rw-r--r-- | pkg/api/handlers/compat/containers_stats.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go index 6855e369b..66743ce06 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -132,6 +132,12 @@ streamLabel: // A label to flatten the scope InstanceID: "", } + cfg := ctnr.Config() + memoryLimit := cgroupStat.Memory.Usage.Limit + if cfg.Spec.Linux != nil && cfg.Spec.Linux.Resources != nil && cfg.Spec.Linux.Resources.Memory != nil && *cfg.Spec.Linux.Resources.Memory.Limit > 0 { + memoryLimit = uint64(*cfg.Spec.Linux.Resources.Memory.Limit) + } + systemUsage, _ := cgroups.GetSystemCPUUsage() s := StatsJSON{ Stats: Stats{ @@ -173,7 +179,7 @@ streamLabel: // A label to flatten the scope MaxUsage: cgroupStat.Memory.Usage.Limit, Stats: nil, Failcnt: 0, - Limit: cgroupStat.Memory.Usage.Limit, + Limit: memoryLimit, Commit: 0, CommitPeak: 0, PrivateWorkingSet: 0, |