scheduler: fix reservation calc error (#1949)

Signed-off-by: Joseph <joseph.t.lee@outlook.com>
koordinator-sh · Mar 13, 2024 · 9184517 · 9184517
1 parent 61c0013
commit 9184517
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/scheduler/plugins/deviceshare/reservation.go b/pkg/scheduler/plugins/deviceshare/reservation.go
@@ -149,11 +149,13 @@ func (p *Plugin) RestoreReservation(ctx context.Context, cycleState *framework.C
 					allocated = appendAllocatedByHints(minorHints, allocated, podAllocated)
 				}
 			}
+			remained := subtractAllocated(copyDeviceResources(allocatable), allocated, false)
+
 			result = append(result, reservationAlloc{
 				rInfo:       rInfo,
 				allocatable: allocatable,
 				allocated:   allocated,
-				remained:    subtractAllocated(copyDeviceResources(allocatable), allocated, true),
+				remained:    remained,
 			})
 		}
 		return result

diff --git a/pkg/scheduler/plugins/reservation/plugin.go b/pkg/scheduler/plugins/reservation/plugin.go
@@ -439,7 +439,7 @@ func fitsNode(podRequest *framework.Resource, nodeInfo *framework.NodeInfo, node
 
 	var rRemained *framework.Resource
 	if rInfo != nil {
-		resources := quotav1.SubtractWithNonNegativeResult(rInfo.Allocatable, rInfo.Allocated)
+		resources := quotav1.Subtract(rInfo.Allocatable, rInfo.Allocated)
 		rRemained = framework.NewResource(resources)
 	} else {
 		rRemained = dummyResource