[1.1] feat: add swapOnlyUsage in MemoryStats#4131
Merged
mrunalp merged 1 commit intoopencontainers:release-1.1from Dec 12, 2023
Merged
[1.1] feat: add swapOnlyUsage in MemoryStats#4131mrunalp merged 1 commit intoopencontainers:release-1.1from
mrunalp merged 1 commit intoopencontainers:release-1.1from
Conversation
Author
Author
|
/cc @kolyshkin |
kolyshkin
approved these changes
Dec 12, 2023
Contributor
kolyshkin
left a comment
kolyshkin
left a comment
There was a problem hiding this comment.
LGTM (but I hope we'll release 1.2.0 soon rather than make more 1.1.x releases)
This field reports swap-only usage. For cgroupv1, `Usage` and `Failcnt` are set by subtracting memory usage from memory+swap usage. For cgroupv2, `Usage`, `Limit`, and `MaxUsage` are set. This commit also export `MaxUsage` of memory under cgroupv2 mode, using `memory.peak` introduced in kernel 5.19. Signed-off-by: Heran Yang <heran55@126.com> (cherry picked from commit 104b8dc) Signed-off-by: Harshal Patil <harpatil@redhat.com>
mrunalp
approved these changes
Dec 12, 2023
lifubang
reviewed
Dec 16, 2023
| This aligns cgroupv2 root usage more closely with cgroupv1 reporting. | ||
| Additionally, report root swap usage as sum of swap and memory usage, | ||
| aligned with v1 and existing non-root v2 reporting. (#3933) | ||
| * Add `swapOnlyUsage` in `MemoryStats`. This field reports swap-only usage. |
Member
There was a problem hiding this comment.
I think these change logs are wrong, it should be removed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a 1.1 backport of #4010