Fix: check if RGs is updated #1356

KunWuLuan · 2023-11-22T01:48:36Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fix #1344

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

No

Fix the bug which will update AllocatableResourceGeneration even the RGs are not updated

netlify · 2023-11-22T01:48:42Z

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

Name	Link
🔨 Latest commit	`606aca8`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6563f8b380d86d000861af64

k8s-ci-robot · 2023-11-22T01:48:45Z

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

alculquicondor · 2023-11-22T15:46:34Z

/ok-to-test
/assign

pkg/cache/clusterqueue.go

pkg/scheduler/flavorassigner/flavorassigner.go

pkg/scheduler/scheduler_test.go

test/integration/scheduler/scheduler_test.go

pkg/scheduler/scheduler_test.go

alculquicondor · 2023-11-22T21:37:36Z

test/integration/scheduler/scheduler_test.go

@@ -1075,6 +1075,36 @@ var _ = ginkgo.Describe("Scheduler", func() {
 			util.ExpectWorkloadsToHaveQuotaReservation(ctx, k8sClient, devCQ.Name, dWl1)
 		})

+		ginkgo.It("Should try next flavor instead of pending", func() {


@nstogner any other integration test you would like to see?

tenzen-y

This approach looks good to me. I'll leave review and approve to @alculquicondor.
/uncc

tenzen-y · 2023-11-23T18:58:56Z

pkg/cache/clusterqueue.go

@@ -225,7 +227,9 @@ func (c *ClusterQueue) updateResourceGroups(in []kueue.ResourceGroup) {
 			rg.Flavors = append(rg.Flavors, fQuotas)
 		}
 	}
-	c.AllocatableResourceGeneration++
+	if !reflect.DeepEqual(oldRG, c.ResourceGroups) {


One consideration. I'm wondering if we should decide which DeepEqual we should use. reflect pkg vs equality.Semantic pkg.

However, I think this is out of the scope of this PR.

we are using equality everywhere else, so we should stick with it.

I could see the case for using reflect package here:

kueue/pkg/config/config.go

Lines 119 to 129 in 1ecd79f

if o.LeaseDuration == nil && !reflect.DeepEqual(cfg.LeaderElection.LeaseDuration, metav1.Duration{}) {

o.LeaseDuration = &cfg.LeaderElection.LeaseDuration.Duration

}

if o.RenewDeadline == nil && !reflect.DeepEqual(cfg.LeaderElection.RenewDeadline, metav1.Duration{}) {

o.RenewDeadline = &cfg.LeaderElection.RenewDeadline.Duration

}

if o.RetryPeriod == nil && !reflect.DeepEqual(cfg.LeaderElection.RetryPeriod, metav1.Duration{}) {

o.RetryPeriod = &cfg.LeaderElection.RetryPeriod.Duration

}

However, I agree with using equality everywhere.

Have changed reflect.DeepEqual to equality.Semantic.DeepEqual, thanks

alculquicondor · 2023-11-23T20:49:43Z

test/integration/scheduler/scheduler_test.go

+				Cohort("all").
+				ResourceGroup(
+					*testing.MakeFlavorQuotas("on-demand").Resource(corev1.ResourceCPU, "2").Obj(),
+					*testing.MakeFlavorQuotas("spot-untainted").Resource(corev1.ResourceCPU, "2").Obj()).


I just noticed that this doesn't have fungibility or preemption policies set. Was it failing even without fungibility police?

alculquicondor · 2023-11-23T21:04:59Z

I addressed my own comments here 0cef5b3

But I discovered that the solution is incomplete: it doesn't work for BestEffortFIFO.

Feel free to cherry-pick my commit and continue working on this.

alculquicondor · 2023-11-24T18:56:07Z

I opened a new PR that addresses both issues #1366

k8s-ci-robot · 2023-11-27T02:02:32Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: KunWuLuan
Once this PR has been reviewed and has the lgtm label, please ask for approval from alculquicondor. 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:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

KunWuLuan · 2023-11-27T02:05:53Z

I opened a new PR that addresses both issues #1366

We can continue working on this PR #1366.

k8s-ci-robot · 2023-11-27T02:11:39Z

@KunWuLuan: 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-kueue-test-unit-main	`606aca8`	link	true	`/test pull-kueue-test-unit-main`
pull-kueue-verify-main	`606aca8`	link	true	`/test pull-kueue-verify-main`

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.

alculquicondor · 2023-11-27T13:31:07Z

Thanks
/close

k8s-ci-robot · 2023-11-27T13:31:12Z

@alculquicondor: Closed this PR.

In response to this:

Thanks
/close

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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Nov 22, 2023

k8s-ci-robot requested review from mimowo and tenzen-y November 22, 2023 01:48

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 22, 2023

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 22, 2023

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 22, 2023

k8s-ci-robot assigned alculquicondor Nov 22, 2023

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 Nov 22, 2023

alculquicondor reviewed Nov 22, 2023

View reviewed changes

pkg/scheduler/scheduler_test.go Outdated Show resolved Hide resolved

alculquicondor reviewed Nov 22, 2023

View reviewed changes

tenzen-y reviewed Nov 23, 2023

View reviewed changes

alculquicondor reviewed Nov 23, 2023

View reviewed changes

tenzen-y mentioned this pull request Nov 24, 2023

Use equality pkg instead of reflect pkg for the DeepEqual function #1363

Merged

alculquicondor mentioned this pull request Nov 24, 2023

Fix fungibility: Try next flavor if can't preempt on first #1366

Merged

fix: check if RGs is updated

606aca8

KunWuLuan force-pushed the main branch from 0f528e9 to 606aca8 Compare November 27, 2023 02:02

k8s-ci-robot closed this Nov 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: check if RGs is updated #1356

Fix: check if RGs is updated #1356

KunWuLuan commented Nov 22, 2023

netlify bot commented Nov 22, 2023 •

edited

Loading

k8s-ci-robot commented Nov 22, 2023

alculquicondor commented Nov 22, 2023

alculquicondor Nov 22, 2023

tenzen-y left a comment

tenzen-y Nov 23, 2023

alculquicondor Nov 23, 2023

tenzen-y Nov 23, 2023

tenzen-y Nov 23, 2023

KunWuLuan Nov 27, 2023

alculquicondor Nov 23, 2023 •

edited

Loading

alculquicondor commented Nov 23, 2023 •

edited

Loading

alculquicondor commented Nov 24, 2023

k8s-ci-robot commented Nov 27, 2023

KunWuLuan commented Nov 27, 2023 •

edited

Loading

k8s-ci-robot commented Nov 27, 2023

alculquicondor commented Nov 27, 2023

k8s-ci-robot commented Nov 27, 2023

	if o.LeaseDuration == nil && !reflect.DeepEqual(cfg.LeaderElection.LeaseDuration, metav1.Duration{}) {
	o.LeaseDuration = &cfg.LeaderElection.LeaseDuration.Duration
	}

	if o.RenewDeadline == nil && !reflect.DeepEqual(cfg.LeaderElection.RenewDeadline, metav1.Duration{}) {
	o.RenewDeadline = &cfg.LeaderElection.RenewDeadline.Duration
	}

	if o.RetryPeriod == nil && !reflect.DeepEqual(cfg.LeaderElection.RetryPeriod, metav1.Duration{}) {
	o.RetryPeriod = &cfg.LeaderElection.RetryPeriod.Duration
	}

Fix: check if RGs is updated #1356

Fix: check if RGs is updated #1356

Conversation

KunWuLuan commented Nov 22, 2023

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

netlify bot commented Nov 22, 2023 • edited Loading

✅ Deploy Preview for kubernetes-sigs-kueue canceled.

k8s-ci-robot commented Nov 22, 2023

alculquicondor commented Nov 22, 2023

alculquicondor Nov 22, 2023

Choose a reason for hiding this comment

tenzen-y left a comment

Choose a reason for hiding this comment

tenzen-y Nov 23, 2023

Choose a reason for hiding this comment

alculquicondor Nov 23, 2023

Choose a reason for hiding this comment

tenzen-y Nov 23, 2023

Choose a reason for hiding this comment

tenzen-y Nov 23, 2023

Choose a reason for hiding this comment

KunWuLuan Nov 27, 2023

Choose a reason for hiding this comment

alculquicondor Nov 23, 2023 • edited Loading

Choose a reason for hiding this comment

alculquicondor commented Nov 23, 2023 • edited Loading

alculquicondor commented Nov 24, 2023

k8s-ci-robot commented Nov 27, 2023

KunWuLuan commented Nov 27, 2023 • edited Loading

k8s-ci-robot commented Nov 27, 2023

alculquicondor commented Nov 27, 2023

k8s-ci-robot commented Nov 27, 2023

netlify bot commented Nov 22, 2023 •

edited

Loading

alculquicondor Nov 23, 2023 •

edited

Loading

alculquicondor commented Nov 23, 2023 •

edited

Loading

KunWuLuan commented Nov 27, 2023 •

edited

Loading