Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

win: fix cpu count to calculate cpu_maximum #114231

Merged
merged 1 commit into from Jan 17, 2023
Merged

win: fix cpu count to calculate cpu_maximum #114231

merged 1 commit into from Jan 17, 2023

Conversation

mweibel
Copy link
Contributor

@mweibel mweibel commented Dec 1, 2022 •
edited

/sig windows
/hold

What type of PR is this?

/kind bug

What this PR does / why we need it:

Take all processor groups into account when calculating cpu maximum for windows.

Signed-off-by: Michael Weibel michael@helio.exchange

Which issue(s) this PR fixes:

Fixes #114211

Special notes for your reviewer:

I'd appreciate help with writing tests for this.

Does this PR introduce a user-facing change?

Fixed an issue when calculating CPU limits on Windows nodes with more than 64 logical processors

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. sig/windows Categorizes an issue or PR as relevant to SIG Windows. kind/bug Categorizes issue or PR as related to a bug. labels Dec 1, 2022
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.26 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.26.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Thu Dec 1 09:40:53 UTC 2022.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 1, 2022
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 1, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @mweibel!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @mweibel. Thanks for your PR.

I'm waiting for a kubernetes 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.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 1, 2022
@matthyx
Copy link
Contributor

matthyx commented Dec 2, 2022

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 2, 2022
@mweibel
Copy link
Contributor Author

mweibel commented Dec 2, 2022

/retest

log looks like it didn't fail because of the change, I'm not 100% sure but I hope it's ok if I just run a retest.

@mweibel
Copy link
Contributor Author

mweibel commented Dec 2, 2022

/retest

@jsturtevant
Copy link
Contributor

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 5, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 16, 2022
@matthyx matthyx moved this from Needs Reviewer to Needs Approver in SIG Node PR Triage Dec 16, 2022
aravindhp
aravindhp reviewed Dec 16, 2022
View reviewed changes
Copy link
Contributor

@aravindhp aravindhp left a comment

Choose a reason for hiding this comment

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

/lgtm

@aravindhp
Copy link
Contributor

/retest-required

@mweibel
Copy link
Contributor Author

mweibel commented Dec 19, 2022

👍 thanks. Tests passed!

@jsturtevant
Copy link
Contributor

lgtm
/assign @marosset @claudiubelu

marosset
marosset approved these changes Jan 3, 2023
View reviewed changes
Copy link
Contributor

@marosset marosset left a comment

Choose a reason for hiding this comment

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

/lgtm

@mweibel - Can you update the release notes to something like `Fixing issue on Windows when calculating cpu limits on nodes with more than 64 logical processors' ?

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jan 4, 2023
@mweibel
Copy link
Contributor Author

mweibel commented Jan 4, 2023

@marosset thanks! I updated the PR to include the release note.

@matthyx
Copy link
Contributor

matthyx commented Jan 5, 2023

/uncc

@k8s-ci-robot k8s-ci-robot removed the request for review from matthyx January 5, 2023 20:21
@mweibel
Copy link
Contributor Author

mweibel commented Jan 9, 2023

folks, what can I do to get this approved?

@jsturtevant
Copy link
Contributor

looks like it is on the sig-node triage board marked ready for approval. Will need someone from the kubelet approvers file to give the approval.

/assign @derekwaynecarr @mrunalp

@dims
Copy link
Member

dims commented Jan 17, 2023

The PR just touches windows related code and nothing in kubelet and has a bunch of LGTM(s) from sig-windows folks. Happy to land this with my sig-node reviewer hat on.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, marosset, mweibel

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2023
@k8s-ci-robot
Copy link
Contributor

@mweibel: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kubernetes-e2e-inplace-pod-resize-containerd-main-v2 d9abd48979b05398dd57f630dbdbb6da6ba3c9ab link false /test pull-kubernetes-e2e-inplace-pod-resize-containerd-main-v2
pull-kubernetes-unit 8818c21 link unknown /test pull-kubernetes-unit
pull-kubernetes-e2e-kind 8818c21 link unknown /test pull-kubernetes-e2e-kind

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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/test-infra repository. I understand the commands that are listed here.

@mweibel
Copy link
Contributor Author

mweibel commented Jan 17, 2023

/retest

@k8s-ci-robot k8s-ci-robot merged commit 727b5a4 into kubernetes:master Jan 17, 2023
SIG Node PR Triage automation moved this from Needs Approver to Done Jan 17, 2023
@sftim
Copy link
Contributor

sftim commented Jan 24, 2023

Suggested changelog tweak:

Fixed an issue when calculating CPU limits on Windows nodes with more than 64 logical processors

@mweibel
Copy link
Contributor Author

mweibel commented Jan 25, 2023

@sftim thanks - applied it on the first comment. I assume when generating the changelog it'll take this into account?

@sftim
Copy link
Contributor

sftim commented Jan 25, 2023

I assume when generating the changelog it'll take this into account?

That's what I understand. Thanks for the tweak.

@pacoxu pacoxu mentioned this pull request Mar 10, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@profnandaa profnandaa profnandaa left review comments

@jsturtevant jsturtevant jsturtevant left review comments

@aravindhp aravindhp aravindhp left review comments

@matthyx matthyx matthyx requested changes

@marosset marosset marosset approved these changes

Assignees

@mrunalp mrunalp

@claudiubelu claudiubelu

@derekwaynecarr derekwaynecarr

@aravindhp aravindhp

@marosset marosset

@matthyx matthyx

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/windows Categorizes an issue or PR as relevant to SIG Windows. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Done
[sig-windows] PR tracking
Status: Done
Milestone
v1.27
Development

Successfully merging this pull request may close these issues.

windows cpu maximum incorrect with more than one processor group