scheduler: fix calFreeWithPreemptible modify nodeDevice (#2453)

Signed-off-by: wangjianyu.wjy <[email protected]>
Co-authored-by: wangjianyu.wjy <[email protected]>

Author: ZiMengSheng

pkg/scheduler/plugins/deviceshare/device_cache.go

@@ -349,15 +349,16 @@ func (n *nodeDevice) calcFreeWithPreemptible(deviceType schedulingv1alpha1.Devic
 
 	// If allocating from a required resources, e.g. a reservation, the free should be no larger than the reserved free.
 	if len(requiredDeviceResources) > 0 {
+		requiredDeviceFree := deviceResources{}
 		for minor, v := range deviceFree {
 			required, ok := requiredDeviceResources[minor]
 			if !ok {
-				delete(deviceFree, minor)
 				continue
 			}
 			v = util.MinResourceList(v, required)
-			deviceFree[minor] = v
+			requiredDeviceFree[minor] = v
 		}
+		return requiredDeviceFree
 	}
 
 	return deviceFree

pkg/scheduler/plugins/deviceshare/device_cache_test.go

@@ -142,3 +142,92 @@ func Test_gcNodeDevices(t *testing.T) {
 	nodeNames := sets.StringKeySet(cache.nodeDeviceInfos)
 	assert.Equal(t, expectedNodeNames, nodeNames)
 }
+
+func Test_nodeDevice_calcFreeWithPreemptible(t *testing.T) {
+	tests := []struct {
+		name                    string
+		deviceFree              map[schedulingv1alpha1.DeviceType]deviceResources
+		requiredDeviceResources deviceResources
+		wantFree                deviceResources
+		wantOriginalFree        map[schedulingv1alpha1.DeviceType]deviceResources
+	}{
+		{
+			name: "assure free not changed",
+			deviceFree: map[schedulingv1alpha1.DeviceType]deviceResources{
+				schedulingv1alpha1.GPU: {
+					0: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					1: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					2: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					3: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					4: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					5: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					6: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					7: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+				},
+			},
+			requiredDeviceResources: deviceResources{
+				0: corev1.ResourceList{
+					apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+				},
+			},
+			wantFree: deviceResources{
+				0: corev1.ResourceList{
+					apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+				},
+			},
+			wantOriginalFree: map[schedulingv1alpha1.DeviceType]deviceResources{
+				schedulingv1alpha1.GPU: {
+					0: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					1: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					2: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					3: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					4: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					5: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					6: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+					7: corev1.ResourceList{
+						apiext.ResourceGPUMemory: resource.MustParse("8Gi"),
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			n := &nodeDevice{
+				deviceFree: tt.deviceFree,
+			}
+			assert.Equal(t, tt.wantFree, n.calcFreeWithPreemptible(schedulingv1alpha1.GPU, nil, tt.requiredDeviceResources))
+			assert.Equal(t, tt.wantOriginalFree, n.deviceFree)
+		})
+	}
+}