[v0.51] cgroups: fix memory usage on cgroup v1 #2157
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: giuseppe The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
LGTM |
|
I've put the merge hold on this as this branch is too far back. We need this fix in c/common v0.57 and Podman v4.9.-rhel. Then also please verify that it's in the Podman v5.2-rhel branch and c/common v0.60 @giuseppe |
|
both versions already have this change |
|
I've removed the do-not-merge/hold label. I've verified that the fix is in the v0.57 branch, which we need for RHEL 4.9 as @giuseppe pointed out. We do need this backported for this branch of c/common so it can be used by podman v4.4.1-rhel for https://issues.redhat.com/browse/ACCELFIX-285 and https://issues.redhat.com/browse/ACCELFIX-286. The error that we're running into here is the same as #2154 |
|
Partially Fixes: https://issues.redhat.com/browse/RHEL-59127 |
|
/lgtm |
calculate the memory usage on cgroup v1 using the same logic as cgroup v2. Since there is no single "anon" field, calculate the memory usage by summing the two fields "total_active_anon" and "total_inactive_anon". Closes: containers#1642 Closes: https://issues.redhat.com/browse/RHEL-16376 [NO NEW TESTS NEEDED] Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> (cherry picked from commit 1a9d45c)
giuseppe
force-pushed
the
fix-memory-usage-cgroup-v-0.51
branch
from
042ed6e to
00ff6a8
Compare
|
LGTM |
|
/lgtm |
|
OK, I'm losing my mind a bit here. When I opened this up, it was all happy green test buttons. I added a LGTM and then a |
|
Weird. I see |
|
And after restarting, I hit a for real network flake, restarted again. |
|
All green, but still in tide pool. I have not reviewed, but I'll trust y'all. Merged. |
|
TY @edsantiago ! I'll create the release tomorrow, time to get off this contraption now. |
calculate the memory usage on cgroup v1 using the same logic as cgroup v2.
Since there is no single "anon" field, calculate the memory usage by summing the two fields "total_active_anon" and "total_inactive_anon".
Closes: #1642
Closes: https://issues.redhat.com/browse/RHEL-16376
[NO NEW TESTS NEEDED]
Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com
(cherry picked from commit 1a9d45c)