Cherry pick #100901 to 26.2: Subtract slab_reclaimable from kernel memory in cgroupv2 reader#101600
Merged
robot-clickhouse-ci-1 merged 4 commits intobackport/26.2/100901from Apr 2, 2026
Merged
Conversation
The cgroupv2 memory usage calculation now uses `anon + sock + (kernel - slab_reclaimable)` instead of `anon + sock + kernel`. The `slab_reclaimable` portion is reclaimed synchronously by the kernel under memory pressure before invoking the OOM killer, so it should not count against the application's memory budget. Also refactors `readMetricsFromStatFile` to populate a caller-owned map of individual metric values instead of returning a sum, allowing callers to apply their own aggregation logic. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Use `const auto *` instead of `auto` for the iterator over `std::initializer_list<std::string_view>`, matching the existing style on line 88. https://s3.amazonaws.com/clickhouse-test-reports/json.html?PR=100901&sha=b4ef919a6193782e42a3c463a9bc0a43c632ebb0&name_0=PR&name_1=Build%20%28arm_tidy%29 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
All keys (`kernel`, `slab_reclaimable`) have been in cgroupv2 `memory.stat` from the beginning, so there is no need for an optional/mandatory distinction. Warn once on any missing key — this also surfaces old-kernel or buggy environments. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
…aimable Subtract slab_reclaimable from kernel memory in cgroupv2 reader
522695a
into
backport/26.2/100901
163 of 166 checks passed
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
2 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.
Original pull-request #100901
Do not merge this PR manually
This pull-request is a first step of an automated backporting.
It contains changes similar to calling
git cherry-picklocally.If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
The check results does not matter at this step - you can safely ignore them.
Troubleshooting
If the conflicts were resolved in a wrong way
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:
pr-cherrypicklabel from the PRYou also need to check the Original pull-request for
pr-backports-createdlabel, and delete if it's presented thereThe PR source
The PR is created in the CI job