improve scheduler getFullResult (#324)

* improve cpu scheduler: use remainder to getFullRes

* transform recursive into for loop

Author: jschwinger233

scheduler/complex/cpu_test.go

@@ -235,3 +235,28 @@ func TestCPUReallocWithPriorPlan(t *testing.T) {
 	_, _, _, err = po.ReselectCPUNodes(scheduleInfo, CPU, 2, 0)
 	assert.EqualError(t, err, "not enough resource")
 }
+
+func TestGetFullResult(t *testing.T) {
+	h := host{share: 100}
+	res := h.getFullResult(2, []resourceInfo{
+		{
+			id:     "0",
+			pieces: 400,
+		},
+		{
+			id:     "1",
+			pieces: 200,
+		},
+		{
+			id:     "2",
+			pieces: 400,
+		},
+	})
+	assert.EqualValues(t, 4, len(res))
+	assert.ElementsMatch(t, res, []types.ResourceMap{
+		{"0": 100, "1": 100},
+		{"0": 100, "1": 100},
+		{"0": 100, "2": 100},
+		{"0": 100, "2": 100},
+	})
+}

scheduler/complex/resource.go

@@ -183,24 +183,26 @@ func (h *host) getFragmentsResult(resources []resourceInfo, fragments ...int64)
 
 func (h *host) getFullResult(full int, resources []resourceInfo) []types.ResourceMap {
 	result := []types.ResourceMap{}
-	count := len(resources) / full
-	newResources := []resourceInfo{}
-	for i := 0; i < count; i++ {
-		plan := types.ResourceMap{}
-		for j := i * full; j < i*full+full; j++ {
-			// 洗掉没配额的
-			last := resources[j].pieces - int64(h.share)
-			if last > 0 {
-				newResources = append(newResources, resourceInfo{resources[j].id, last})
+
+	for len(resources)/full > 0 {
+		count, rem := len(resources)/full, len(resources)%full
+		newResources := []resourceInfo{}
+		for i := 0; i < count; i++ {
+			plan := types.ResourceMap{}
+			for j := i * full; j < i*full+full; j++ {
+				// 洗掉没配额的
+				last := resources[j].pieces - int64(h.share)
+				if last > 0 {
+					newResources = append(newResources, resourceInfo{resources[j].id, last})
+				}
+				plan[resources[j].id] = int64(h.share)
 			}
-			plan[resources[j].id] = int64(h.share)
+			result = append(result, plan)
 		}
-		result = append(result, plan)
-	}
 
-	if len(newResources)/full > 0 {
-		return append(result, h.getFullResult(full, newResources)...)
+		resources = append(newResources, resources[len(resources)-rem:]...)
 	}
+
 	return result
 }