From 677cbe6c2e09e01f2bf9b4775227232b235598bf Mon Sep 17 00:00:00 2001 From: Michal Wozniak Date: Mon, 15 Apr 2024 16:29:14 +0200 Subject: [PATCH] remarks2 --- pkg/scheduler/scheduler_test.go | 90 --------------------------------- 1 file changed, 90 deletions(-) diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index e9ca6cf408..070690d9f4 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -1492,96 +1492,6 @@ func TestSchedule(t *testing.T) { "eng-beta/b3": *utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), }, }, - "minimal preemptions when target queue is exhausted in one resource, but not the other": { - additionalClusterQueues: []kueue.ClusterQueue{ - *utiltesting.MakeClusterQueue("other-alpha"). - Cohort("other"). - Preemption(kueue.ClusterQueuePreemption{ - ReclaimWithinCohort: kueue.PreemptionPolicyAny, - WithinClusterQueue: kueue.PreemptionPolicyLowerPriority, - }). - ResourceGroup( - *utiltesting.MakeFlavorQuotas("on-demand"). - Resource(corev1.ResourceCPU, "2").Resource(corev1.ResourceMemory, "2").Obj(), - ). - Obj(), - *utiltesting.MakeClusterQueue("other-beta"). - Cohort("other"). - ResourceGroup( - *utiltesting.MakeFlavorQuotas("on-demand"). - Resource(corev1.ResourceCPU, "2").Resource(corev1.ResourceMemory, "2").Obj(), - ). - Obj(), - *utiltesting.MakeClusterQueue("other-gamma"). - Cohort("other"). - ResourceGroup( - *utiltesting.MakeFlavorQuotas("on-demand"). - Resource(corev1.ResourceCPU, "2").Resource(corev1.ResourceMemory, "2").Obj(), - ). - Obj(), - }, - additionalLocalQueues: []kueue.LocalQueue{ - *utiltesting.MakeLocalQueue("other", "eng-alpha").ClusterQueue("other-alpha").Obj(), - *utiltesting.MakeLocalQueue("other", "eng-beta").ClusterQueue("other-beta").Obj(), - *utiltesting.MakeLocalQueue("other", "eng-gamma").ClusterQueue("other-gamma").Obj(), - }, - workloads: []kueue.Workload{ - *utiltesting.MakeWorkload("a1", "eng-alpha"). - Priority(-2). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("a2", "eng-alpha"). - Priority(-2). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("a3", "eng-alpha"). - Priority(-1). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("b1", "eng-beta"). - Priority(0). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("b2", "eng-beta"). - Priority(0). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("b3", "eng-beta"). - Priority(0). - Queue("other"). - Request(corev1.ResourceCPU, "1"). - ReserveQuota(utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj()). - Obj(), - *utiltesting.MakeWorkload("incoming", "eng-alpha"). - Priority(0). - Queue("other"). - Request(corev1.ResourceCPU, "2"). - Request(corev1.ResourceMemory, "2"). - Obj(), - }, - wantPreempted: sets.New("eng-alpha/a1", "eng-alpha/a2"), - wantLeft: map[string][]string{ - "other-alpha": {"eng-alpha/incoming"}, - }, - wantAssignments: map[string]kueue.Admission{ - "eng-alpha/a1": *utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - "eng-alpha/a2": *utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - "eng-alpha/a3": *utiltesting.MakeAdmission("other-alpha").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - "eng-beta/b1": *utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - "eng-beta/b2": *utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - "eng-beta/b3": *utiltesting.MakeAdmission("other-beta").Assignment(corev1.ResourceCPU, "on-demand", "1").Obj(), - }, - }, "A workload is only eligible to do preemptions if it fits fully within nominal quota": { additionalClusterQueues: []kueue.ClusterQueue{ *utiltesting.MakeClusterQueue("other-alpha").