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.

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

improve the nodeclaim sorting algorithm using heap #1844

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

jxs1211
Copy link

@jxs1211 jxs1211 commented Nov 26, 2024

perf

Description
improve the nodeclaim sorting according to the todo comment

How was this change tested?
implementation with test case

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Copy link

linux-foundation-easycla bot commented Nov 26, 2024

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: jxs1211 / name: Jay Shane (8b2ca03)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jxs1211
Once this PR has been reviewed and has the lgtm label, please assign gjtempleton for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Nov 26, 2024
@k8s-ci-robot
Copy link
Contributor

Welcome @jxs1211!

It looks like this is your first PR to kubernetes-sigs/karpenter 🎉. 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-sigs/karpenter 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 @jxs1211. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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-sigs/prow 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 26, 2024
@coveralls
Copy link

Pull Request Test Coverage Report for Build 12022204027

Details

  • 18 of 21 (85.71%) changed or added relevant lines in 2 files are covered.
  • 5 unchanged lines in 2 files lost coverage.
  • Overall coverage increased (+0.02%) to 81.063%

Changes Missing Coverage Covered Lines Changed/Added Lines %
pkg/controllers/provisioning/scheduling/heap.go 14 17 82.35%
Files with Coverage Reduction New Missed Lines %
pkg/utils/termination/termination.go 2 92.31%
pkg/controllers/provisioning/scheduling/nodeclaim.go 3 85.64%
Totals Coverage Status
Change from base Build 11994809568: 0.02%
Covered Lines: 8861
Relevant Lines: 10931

💛 - Coveralls

Copy link

This PR has been inactive for 14 days. StaleBot will close this stale PR after 14 more days of inactivity.

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 10, 2024
Comment on lines -275 to +280
// Consider using https://pkg.go.dev/container/heap
sort.Slice(s.newNodeClaims, func(a, b int) bool { return len(s.newNodeClaims[a].Pods) < len(s.newNodeClaims[b].Pods) })

// Pick existing node that we are about to create
for _, nodeClaim := range s.newNodeClaims {
h := NewNodeClaimHeap(s.newNodeClaims)
heap.Init(h)
for h.Len() > 0 {
nodeClaim := heap.Pop(h).(*NodeClaim)
Copy link
Member

Choose a reason for hiding this comment

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

We should write some benchmarking tests to validate this makes things faster and by how much.

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

Copy link
Author

Choose a reason for hiding this comment

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

I add some benchmark for evaluation, basically heap is better but not that much.

➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          19477929                86.49 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4          8984490               116.3 ns/op            24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   4.877s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ 
➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          16447299                62.18 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4         13348653                78.73 ns/op           24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   2.304s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          17975103                58.27 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4         13778595                88.28 ns/op           24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   2.478s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          20438842                59.15 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4         15978789                75.94 ns/op           24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   6.341s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          17908522                71.79 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4         13740463                77.62 ns/op           24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   2.566s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ go test -run=none -bench=Sorting -benchmem sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling -v
goos: linux
goarch: amd64
pkg: sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling
cpu: Intel(R) Core(TM) i5-7200U CPU @ 2.50GHz
BenchmarkHeapSorting
BenchmarkHeapSorting-4          16799110                67.39 ns/op           24 B/op          1 allocs/op
BenchmarkSliceSorting
BenchmarkSliceSorting-4         13493124                97.02 ns/op           24 B/op          1 allocs/op
PASS
ok      sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling   4.522s
➜  karpenter git:(improve/nodeclaim-sorting) ✗ 

@github-actions github-actions bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 11, 2024
Copy link

This PR has been inactive for 14 days. StaleBot will close this stale PR after 14 more days of inactivity.

@github-actions github-actions bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 27, 2024
@jxs1211 jxs1211 force-pushed the improve/nodeclaim-sorting branch from 998a3fe to 7e40621 Compare December 28, 2024 02:26
@jxs1211 jxs1211 force-pushed the improve/nodeclaim-sorting branch from 7e40621 to 8b2ca03 Compare December 28, 2024 02:27
@github-actions github-actions bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Dec 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants