1- Do not count maxed queues for portion calculations

2- Fix unitests by adding UID to struct definition

Author: davidLif

pkg/scheduler/plugins/proportion/resource_division/resource_division.go

@@ -182,6 +182,11 @@ func divideUpToFairShare(totalResourceAmount, kValue float64, queues map[common_
 				// queue is satisfied, no need to give it more resources
 				continue
 			}
+			if share.MaxAllowed != commonconstants.UnlimitedResourceQuantity &&
+				share.MaxAllowed <= share.FairShare {
+				// queue is satisfied, no need to give it more resources
+				continue
+			}
 
 			// Normalize queue over quota weight
 			nWeight := share.OverQuotaWeight / totalWeights

pkg/scheduler/plugins/proportion/resource_division/resource_division_test.go

@@ -1414,6 +1414,7 @@ var _ = Describe("Proportion", func() {
 				"Request more than total with different Over Quota": {
 					queues: map[common_info.QueueID]*rs.QueueAttributes{
 						"1": {
+							UID: "1",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        250,
@@ -1442,6 +1443,7 @@ var _ = Describe("Proportion", func() {
 							},
 						},
 						"2": {
+							UID: "2",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        150,
@@ -1507,6 +1509,7 @@ var _ = Describe("Proportion", func() {
 				"Request more than total with different Over Quota and max allowed": {
 					queues: map[common_info.QueueID]*rs.QueueAttributes{
 						"1": {
+							UID: "1",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        250,
@@ -1535,6 +1538,7 @@ var _ = Describe("Proportion", func() {
 							},
 						},
 						"2": {
+							UID: "2",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        150,
@@ -1736,6 +1740,7 @@ var _ = Describe("Proportion", func() {
 				"divide resource between queues with different over quota": {
 					queues: map[common_info.QueueID]*rs.QueueAttributes{
 						"1": {
+							UID: "1",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        0,
@@ -1764,6 +1769,7 @@ var _ = Describe("Proportion", func() {
 							},
 						},
 						"2": {
+							UID: "2",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        0,
@@ -1792,6 +1798,7 @@ var _ = Describe("Proportion", func() {
 							},
 						},
 						"3": {
+							UID: "3",
 							QueueResourceShare: rs.QueueResourceShare{
 								GPU: rs.ResourceShare{
 									Deserved:        0,