shim: add support for containerd v2 metrics #11473
Open
+53
−2
Conversation
This file contains 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
|
Testing this change on AWS AL2022 vs AL2023:
Commands used for testing: CPU: The difference between runC and gVisor might be a separate issue. |
|
Thanks for the PR! |
milantracy
reviewed
Feb 14, 2025
|
thanks for the patch! LGTM |
Champ-Goblem
force-pushed
the
shim-add-cgroup-v2-metrics-support
branch
from
ec422c0 to
b3701c8
Compare
milantracy
pushed a commit
to milantracy/gvisor
that referenced
this pull request
Feb 19, 2025
DO NOT SUBMIT Signed-off-by: Champ-Goblem <[email protected]>
milantracy
reviewed
Feb 19, 2025
milantracy
reviewed
Feb 19, 2025
| @@ -31,6 +31,7 @@ go_library( | |||
| "@com_github_containerd_cgroups//:go_default_library", | |||
| "@com_github_containerd_cgroups//stats/v1:go_default_library", | |||
| "@com_github_containerd_cgroups//v2:go_default_library", | |||
| "@com_github_containerd_cgroups//v2/stats:go_default_library", | |||
There was a problem hiding this comment.
our internal pipeline is missing the rule to translate the package, it blocks the submission.
i will fix that in our pipeline
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2. Fixes: google#11472 Signed-off-by: Champ-Goblem <[email protected]>
Champ-Goblem
force-pushed
the
shim-add-cgroup-v2-metrics-support
branch
from
b3701c8 to
b602afb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add support for v2 containerd metrics in the shim, v2 metrics are only used when runsc is run with --system-cgroup=true. Containerd requires v2 metrics when the host is run with CGroupsV2. This issue was noticed when attempting to gather metrics on AL2023 which defaults to CGroupsV2.
Fixes: #11472