scheduler: revise device allocate logic (#1927)

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com> Co-authored-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
koordinator-sh · Mar 5, 2024 · 987c076 · 987c076
1 parent 03f89eb
commit 987c076
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/scheduler/plugins/deviceshare/device_allocator.go b/pkg/scheduler/plugins/deviceshare/device_allocator.go
@@ -213,7 +213,7 @@ func (a *AutopilotAllocator) allocateByTopology(requestCtx *requestContext, node
 	for _, pcie := range freeNodeDevicesInPCIe {
 		if len(pcie.freeDevices[primaryDeviceType]) >= desiredCount {
 			allocations, status := a.jointAllocate(pcie.nodeDevice, requestCtx, jointAllocate, primaryDeviceType, secondaryDeviceTypes, sets.NewString(pcie.PCIeIndex.pcie))
-			if status.IsSuccess() {
+			if status.IsSuccess() && len(allocations) > 0 {
 				return allocations, nil
 			}
 		}

diff --git a/pkg/scheduler/plugins/deviceshare/device_cache.go b/pkg/scheduler/plugins/deviceshare/device_cache.go
@@ -374,7 +374,11 @@ func (n *nodeDevice) filter(
 		for minor, free := range freeDevices {
 			if minors.Has(minor) {
 				totalByDeviceType[minor] = originalTotal[minor].DeepCopy()
-				usedByDeviceType[minor] = quotav1.SubtractWithNonNegativeResult(originalTotal[minor], free)
+				usedByDeviceTypeOfMinor := quotav1.SubtractWithNonNegativeResult(originalTotal[minor], free)
+				if !quotav1.IsZero(usedByDeviceTypeOfMinor) {
+					usedByDeviceType[minor] = usedByDeviceTypeOfMinor
+				}
+
 			}
 		}