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

Even Pods Spread - 4. Preemption Support #79062

Merged
merged 5 commits into from
Jul 25, 2019
Merged

Even Pods Spread - 4. Preemption Support #79062

merged 5 commits into from
Jul 25, 2019

Conversation

Huang-Wei
Copy link
Member

@Huang-Wei Huang-Wei commented Jun 15, 2019 •
edited
Loading

What type of PR is this?

/sig scheduling
/hold

/assign @bsalamat
/cc @krmayankk

What this PR does / why we need it:

This is the 4th PR of the "Even Pods Spread" KEP implementation. After this PR, users can run workloads using "hard topologySpreadConstraints", and high priority Pod can preempt low priority one. (PR to support Priority will be sent out later)

  • Supports preemption for EvenPodsSpread
  • Unit tests on PredicateMetadata
  • Unit tests on genericScheduler.Schedule()

Which issue(s) this PR fixes:

Part of #77284.

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

(will document all the changes in one place)

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 15, 2019
@k8s-ci-robot k8s-ci-robot requested a review from krmayankk June 15, 2019 09:47
@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 15, 2019
@Huang-Wei Huang-Wei mentioned this pull request Jun 15, 2019
Closed
9 tasks
@Huang-Wei
Copy link
Member Author

/kind feature
/priority important-soon

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jun 15, 2019
@Huang-Wei Huang-Wei mentioned this pull request Jun 15, 2019
Merged
@Huang-Wei
Copy link
Member Author

/retest

tedyu
tedyu reviewed Jun 16, 2019
View reviewed changes
pkg/apis/core/validation/validation.go Outdated Show resolved Hide resolved
pkg/apis/core/validation/validation.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/metadata.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/metadata.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/metadata.go Outdated
for pair, podSet := range topologyPairsPodSpreadMap.topologyPairToPods {
// TODO(Huang-Wei): short circuit to skip non-visited <topologyKey: any value> pairs
// if we see 0 as min match of the topologyKey
if l := int32(len(podSet)); l < topologyPairsPodSpreadMap.minMatchMap[pair.key] {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we check that len(podSet) > 0 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope. If l == 0, it means there is a topology domain having 0 pod matching incoming pod's topologySpreadConstrains.

pkg/scheduler/algorithm/predicates/metadata.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/metadata.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/metadata.go Outdated Show resolved Hide resolved
pkg/scheduler/algorithm/predicates/predicates.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 19, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 3, 2019
@Huang-Wei Huang-Wei force-pushed the eps-preemption branch 2 times, most recently from 39de5fc to 926ca0f Compare July 3, 2019 21:06
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 3, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 3, 2019
@Huang-Wei
Copy link
Member Author

/retest

@Huang-Wei Huang-Wei mentioned this pull request Jul 11, 2019
Merged
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 22, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Huang-Wei

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 Jul 22, 2019
@Huang-Wei Huang-Wei mentioned this pull request Jul 23, 2019
Merged
@Huang-Wei Huang-Wei force-pushed the eps-preemption branch 2 times, most recently from 6dd412e to 3a7b032 Compare July 24, 2019 06:37
@Huang-Wei
Copy link
Member Author

/retest

@alculquicondor alculquicondor mentioned this pull request Jul 24, 2019
Closed
6 tasks
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 24, 2019
@Huang-Wei
Copy link
Member Author

/retest

1 similar comment
@Huang-Wei
Copy link
Member Author

/retest

alculquicondor
alculquicondor approved these changes Jul 25, 2019
View reviewed changes
Copy link
Member

@alculquicondor alculquicondor left a comment

Choose a reason for hiding this comment

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

LGTM

pkg/scheduler/algorithm/predicates/metadata_test.go
existingPods []*v1.Pod
nodeIdx int // denotes which node 'addedPod' belongs to
nodes []*v1.Node
injectPodPointers map[topologyPair][]int // non-negative index refers to existingPods[i], negative index refers to addedPod
Copy link
Member

Choose a reason for hiding this comment

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

This is hard to understand. Maybe wantPodInTopology. Although, this might go away with the count based map, so we could leave it for now.

@ahg-g
Copy link
Member

ahg-g commented Jul 25, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2019
@Huang-Wei
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 25, 2019
@fejta-bot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@Huang-Wei
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 7fd8537 into kubernetes:master Jul 25, 2019
@Huang-Wei Huang-Wei deleted the eps-preemption branch July 25, 2019 21:46
@Huang-Wei Huang-Wei mentioned this pull request Aug 7, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahg-g ahg-g ahg-g left review comments

@draveness draveness draveness left review comments

@tedyu tedyu tedyu left review comments

@alculquicondor alculquicondor alculquicondor approved these changes

@krmayankk krmayankk Awaiting requested review from krmayankk

Assignees

@bsalamat bsalamat

@ahg-g ahg-g

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/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Huang-Wei @ahg-g @k8s-ci-robot @fejta-bot @tedyu @alculquicondor @draveness @bsalamat