fix deployer resource check bug

OpenCSGs · Dec 27, 2024 · 2547541 · 2547541
1 parent 68836c4
commit 2547541
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/builder/deploy/deployer.go b/builder/deploy/deployer.go
@@ -728,7 +728,11 @@ func CheckResource(clusterResources *types.ClusterRes, hardware *types.HardWare)
 	}
 	for _, node := range clusterResources.Resources {
 		if float32(mem) <= node.AvailableMem {
-			return checkNodeResource(node, hardware)
+			isAvailable := checkNodeResource(node, hardware)
+			if isAvailable {
+				// if true return, otherwise continue check next node
+				return true
+			}
 		}
 	}
 	return false

diff --git a/builder/deploy/deployer_test.go b/builder/deploy/deployer_test.go
@@ -691,13 +691,18 @@ func TestDeployer_CheckResource(t *testing.T) {
 			Gpu: types.GPU{Num: "1", Type: "t1"},
 			Cpu: types.CPU{Num: "20"},
 		}, false},
+		{&types.HardWare{
+			Gpu: types.GPU{Num: "1", Type: "t1"},
+			Cpu: types.CPU{Num: "12"},
+		}, true},
 	}
 
 	for _, c := range cases {
 		c.hardware.Memory = "1Gi"
 		v := CheckResource(&types.ClusterRes{
 			Resources: []types.NodeResourceInfo{
 				{AvailableXPU: 10, XPUModel: "t1", AvailableCPU: 10, AvailableMem: 10000},
+				{AvailableXPU: 12, XPUModel: "t1", AvailableCPU: 12, AvailableMem: 10000},
 			},
 		}, c.hardware)
 		require.Equal(t, c.available, v, c.hardware)