Skip to content

Conversation

@rzlink
Copy link

@rzlink rzlink commented Jun 24, 2025

Summary
Fixes Windows container memory stats by correctly aggregating CommitMemoryBytes and handling missing stats gracefully.

Key Changes
Fixed aggregation of CommitMemoryBytes in appendMemoryPodStats

Mapped MemoryUsageCommitBytes to container UsageBytes

Handled nil stats without breaking pod-level reporting

Added tests for missing memory stats and updated assertions

Bug
Pod-level memory stats were incomplete due to missing CommitMemoryBytes aggregation. This fix ensures accurate reporting across containers.

Testing
New test for missing stats

All existing tests pass

Improved test clarity and coverage

@k8s-ci-robot
Copy link

Hi @rzlink. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@marosset
Copy link
Contributor

@kiashok - FYI

Copy link
Contributor

@kiashok kiashok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM on green! Thanks.

@estesp
Copy link
Member

estesp commented Jun 27, 2025

thanks for the contribution; you need to amend your commit to add a Signed-off-by: First LastName <email@address.com> as the last line to pass the CI checks.

Summary
Fixes Windows container memory stats by correctly aggregating CommitMemoryBytes and handling missing stats gracefully.

Key Changes
Fixed aggregation of CommitMemoryBytes in appendMemoryPodStats

Mapped MemoryUsageCommitBytes to container UsageBytes

Handled nil stats without breaking pod-level reporting

Added tests for missing memory stats and updated assertions

Bug
Pod-level memory stats were incomplete due to missing CommitMemoryBytes aggregation. This fix ensures accurate reporting across containers.

Testing
New test for missing stats

All existing tests pass

Improved test clarity and coverage

Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
@k8s-ci-robot
Copy link

@rzlink: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot
Copy link

@rzlink: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@github-project-automation github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Jul 1, 2025
@k8s-ci-robot
Copy link

@rzlink: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

Details

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@kiashok
Copy link
Contributor

kiashok commented Jul 1, 2025

/ok-to-test

@rzlink
Copy link
Author

rzlink commented Jul 2, 2025

/retest

@estesp estesp added this pull request to the merge queue Jul 2, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 2, 2025
@rzlink
Copy link
Author

rzlink commented Jul 2, 2025

@estesp , It looks like the PR was removed from the merge queue due to a flaky test failure. Could you please requeue it?

@estesp estesp added this pull request to the merge queue Jul 2, 2025
Merged via the queue into containerd:main with commit 5a8ab17 Jul 2, 2025
304 of 319 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Jul 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

6 participants