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

scheduling: fix duplicate checks for number of enabled queue sort plugin #110167

Merged
merged 1 commit into from
Jun 21, 2022
Merged

scheduling: fix duplicate checks for number of enabled queue sort plugin #110167

merged 1 commit into from
Jun 21, 2022

Conversation

NoicFank
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

remove duplicate checks for number of enabled queue sort plugin, only exactly one queue sort plugin is approved.

Which issue(s) this PR fixes:

NONE

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 23, 2022
@k8s-ci-robot
Copy link
Contributor

@NoicFank: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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
Copy link
Contributor

Hi @NoicFank. 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-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 23, 2022
@k8s-ci-robot k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 23, 2022
@NoicFank
Copy link
Contributor Author

/sig/scheduling

@NoicFank NoicFank changed the title remove duplicate checks for number of enabled queue sort plugin scheduling: remove duplicate checks for number of enabled queue sort plugin May 23, 2022
sanposhiho
sanposhiho approved these changes May 23, 2022
View reviewed changes
Copy link
Member

@sanposhiho sanposhiho left a comment

Choose a reason for hiding this comment

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

nice catch.
/lgtm

@sanposhiho
Copy link
Member

/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 May 23, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2022
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 23, 2022
@NoicFank NoicFank changed the title scheduling: remove duplicate checks for number of enabled queue sort plugin scheduling: fix duplicate checks for number of enabled queue sort plugin May 23, 2022
@NoicFank
Copy link
Contributor Author

/retest

@NoicFank NoicFank requested a review from sanposhiho May 23, 2022 10:03
@NoicFank
Copy link
Contributor Author

@sanposhiho PTAL, thanks.

sanposhiho
sanposhiho reviewed May 23, 2022
View reviewed changes
Copy link
Member

@sanposhiho sanposhiho left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2022
damemi
damemi reviewed May 23, 2022
View reviewed changes
Copy link
Contributor

@damemi damemi left a comment

Choose a reason for hiding this comment

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

just for reference, this check was intentionally moved from Profile validation in https://github.com/kubernetes/kubernetes/pull/105611/files#diff-e0fad3cb95eba326e410d482334119367325838fc0f1434825a3e481fc055f2aL99-L100, since that validation happens earlier it was put ahead of other failures to catch the same fail-fast use case and be consistent with the existing error propagation (which was caught by CI)

Looks like CI passes without it, so I'm not sure if other code has changed around it but I still think having a basic check like this early is good

pkg/scheduler/framework/runtime/framework.go Show resolved Hide resolved
pkg/scheduler/framework/runtime/framework.go Outdated
@@ -347,13 +343,13 @@ func NewFramework(r Registry, profile *config.KubeSchedulerProfile, opts ...Opti
}

if len(f.queueSortPlugins) == 0 {
return nil, fmt.Errorf("no queue sort plugin is enabled")
return nil, fmt.Errorf("no queue sort plugin is enabled for profile with scheduler name %q", profile.SchedulerName)
Copy link
Contributor

Choose a reason for hiding this comment

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

why remove the scheduler name from all of these checks?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, scheduler name is added here.

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2022
@NoicFank NoicFank requested review from kerthcet and damemi May 23, 2022 12:24
@kerthcet
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 23, 2022
@NoicFank NoicFank requested a review from sanposhiho May 24, 2022 06:03
sanposhiho
sanposhiho approved these changes May 24, 2022
View reviewed changes
Copy link
Member

@sanposhiho sanposhiho left a comment

Choose a reason for hiding this comment

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

/lgtm

@NoicFank
Copy link
Contributor Author

/assign @Huang-Wei

@NoicFank
Copy link
Contributor Author

@Huang-Wei please review the code, thanks.

@Huang-Wei
Copy link
Member

/approve

Thanks @NoicFank .

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Huang-Wei, NoicFank, sanposhiho

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 Jun 21, 2022
@k8s-ci-robot k8s-ci-robot merged commit 3d5971a into kubernetes:master Jun 21, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Jun 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sanposhiho sanposhiho sanposhiho approved these changes

@kerthcet kerthcet Awaiting requested review from kerthcet

@damemi damemi Awaiting requested review from damemi

Assignees

@Huang-Wei Huang-Wei

@kerthcet kerthcet

@sanposhiho sanposhiho

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@NoicFank @k8s-ci-robot @sanposhiho @kerthcet @Huang-Wei @damemi