Merge pull request #907 from tenzen-y/sort-usage-resources

[Cache] Sort resourceUsages according to resourceName

pkg/cache/cache.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sort"
 	"sync"
 
 	corev1 "k8s.io/api/core/v1"
@@ -879,6 +880,10 @@ func (c *Cache) Usage(cqObj *kueue.ClusterQueue) ([]kueue.FlavorUsage, int, erro
 				}
 				outFlvUsage.Resources = append(outFlvUsage.Resources, rUsage)
 			}
+			// The resourceUsages should be in a stable order to avoid endless creation of update events.
+			sort.Slice(outFlvUsage.Resources, func(i, j int) bool {
+				return outFlvUsage.Resources[i].Name < outFlvUsage.Resources[j].Name
+			})
 			usage = append(usage, outFlvUsage)
 		}
 	}
@@ -912,6 +917,10 @@ func (c *Cache) LocalQueueUsage(qObj *kueue.LocalQueue) ([]kueue.LocalQueueFlavo
 					Total: workload.ResourceQuantity(rName, flvUsage[rName]),
 				})
 			}
+			// The resourceUsages should be in a stable order to avoid endless creation of update events.
+			sort.Slice(outFlvUsage.Resources, func(i, j int) bool {
+				return outFlvUsage.Resources[i].Name < outFlvUsage.Resources[j].Name
+			})
 			qFlvUsages = append(qFlvUsages, outFlvUsage)
 		}
 	}

pkg/cache/cache_test.go

@@ -1327,7 +1327,15 @@ func TestClusterQueueUsage(t *testing.T) {
 			*utiltesting.MakeFlavorQuotas("model_b").
 				Resource("example.com/gpu", "5").
 				Obj(),
-		).Cohort("one").Obj()
+		).
+		ResourceGroup(
+			*utiltesting.MakeFlavorQuotas("interconnect_a").
+				Resource("example.com/vf-0", "5", "5").
+				Resource("example.com/vf-1", "5", "5").
+				Resource("example.com/vf-2", "5", "5").
+				Obj(),
+		).
+		Cohort("one").Obj()
 	cqWithOutCohort := cq.DeepCopy()
 	cqWithOutCohort.Spec.Cohort = ""
 	workloads := []kueue.Workload{
@@ -1372,6 +1380,14 @@ func TestClusterQueueUsage(t *testing.T) {
 						Name: "example.com/gpu",
 					}},
 				},
+				{
+					Name: "interconnect_a",
+					Resources: []kueue.ResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 			wantWorkloads: 1,
 		},
@@ -1402,6 +1418,14 @@ func TestClusterQueueUsage(t *testing.T) {
 						Borrowed: resource.MustParse("1"),
 					}},
 				},
+				{
+					Name: "interconnect_a",
+					Resources: []kueue.ResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 			wantWorkloads: 2,
 		},
@@ -1432,6 +1456,14 @@ func TestClusterQueueUsage(t *testing.T) {
 						Borrowed: resource.MustParse("0"),
 					}},
 				},
+				{
+					Name: "interconnect_a",
+					Resources: []kueue.ResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 			wantWorkloads: 2,
 		},
@@ -1475,6 +1507,13 @@ func TestLocalQueueUsage(t *testing.T) {
 			*utiltesting.MakeFlavorQuotas("model-b").
 				Resource("example.com/gpu", "5").Obj(),
 		).
+		ResourceGroup(
+			*utiltesting.MakeFlavorQuotas("interconnect-a").
+				Resource("example.com/vf-0", "5", "5").
+				Resource("example.com/vf-1", "5", "5").
+				Resource("example.com/vf-2", "5", "5").
+				Obj(),
+		).
 		Obj()
 	localQueue := *utiltesting.MakeLocalQueue("test", "ns1").
 		ClusterQueue("foo").Obj()
@@ -1522,6 +1561,14 @@ func TestLocalQueueUsage(t *testing.T) {
 						},
 					},
 				},
+				{
+					Name: "interconnect-a",
+					Resources: []kueue.LocalQueueResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 		},
 		"all workloads are admitted": {
@@ -1576,6 +1623,14 @@ func TestLocalQueueUsage(t *testing.T) {
 						},
 					},
 				},
+				{
+					Name: "interconnect-a",
+					Resources: []kueue.LocalQueueResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 		},
 		"some workloads are inadmissible": {
@@ -1624,6 +1679,14 @@ func TestLocalQueueUsage(t *testing.T) {
 						},
 					},
 				},
+				{
+					Name: "interconnect-a",
+					Resources: []kueue.LocalQueueResourceUsage{
+						{Name: "example.com/vf-0"},
+						{Name: "example.com/vf-1"},
+						{Name: "example.com/vf-2"},
+					},
+				},
 			},
 		},
 	}