Merge branch 'debug' into 'master'

fix AllocContainerPlan bug

See merge request !45

Author: CMGS

VERSION

@@ -1 +1 @@
-0.7.12c
+0.7.12d

utils/alloc_plan.go

@@ -20,6 +20,12 @@ func (a ByCoreNum) Len() int           { return len(a) }
 func (a ByCoreNum) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByCoreNum) Less(i, j int) bool { return a[i].CorePer < a[j].CorePer }
 
+type ByMemCap []NodeInfo
+
+func (a ByMemCap) Len() int           { return len(a) }
+func (a ByMemCap) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a ByMemCap) Less(i, j int) bool { return a[i].Memory < a[j].Memory }
+
 func AllocContainerPlan(nodeInfo ByCoreNum, quota int, memory int64, count int) (map[string]int, error) {
 	log.Debugf("[AllocContainerPlan]: nodeInfo: %v, quota: %d, memory: %d, count: %d", nodeInfo, quota, memory, count)
 
@@ -40,7 +46,7 @@ func AllocContainerPlan(nodeInfo ByCoreNum, quota int, memory int64, count int)
 	log.Debugf("[AllocContainerPlan] the %d th node has enough cpu quota.", firstNodeWithEnoughCPU)
 
 	// 计算是否有足够的内存满足需求
-	nodeInfoList := []NodeInfo{}
+	nodeInfoList := ByMemCap{}
 	volTotal := 0
 	volEachNode := []int{} //为了排序
 	for i := firstNodeWithEnoughCPU; i < N; i++ {
@@ -65,6 +71,8 @@ func AllocContainerPlan(nodeInfo ByCoreNum, quota int, memory int64, count int)
 		return result, err
 	}
 
+	sort.Sort(nodeInfoList)
+	log.Debugf("[AllocContainerPlan] sorted nodeInfo: %v, ", nodeInfoList)
 	for i, num := range plan {
 		key := nodeInfoList[i].Name
 		result[key] = num

utils/utils_test.go

@@ -122,18 +122,23 @@ func TestAllocContainerPlan(t *testing.T) {
 
 func TestDebugPlan(t *testing.T) {
 	testPodInfo := ByCoreNum{}
-	node0 := NodeInfo{"C2-docker-15", 1600000, 31442075648}
-	node1 := NodeInfo{"C2-docker-16", 1600000, 31576293376}
-	node2 := NodeInfo{"C2-docker-17", 1600000, 31173640192}
-	node3 := NodeInfo{"C2-docker-14", 1600000, 27608481792}
+	node0 := NodeInfo{"C2-docker-14", 1600000, 13732667392}
+	node1 := NodeInfo{"C2-docker-15", 1600000, 4303872000}
+	node2 := NodeInfo{"C2-docker-16", 1600000, 1317527552}
+	node3 := NodeInfo{"C2-docker-17", 1600000, 8808554496}
+	node4 := NodeInfo{"C2-docker-22", 1600000, 1527242752}
+	node5 := NodeInfo{"C2-docker-23", 1600000, 9227984896}
+
 	testPodInfo = append(testPodInfo, node0)
 	testPodInfo = append(testPodInfo, node1)
 	testPodInfo = append(testPodInfo, node2)
 	testPodInfo = append(testPodInfo, node3)
+	testPodInfo = append(testPodInfo, node4)
+	testPodInfo = append(testPodInfo, node5)
 
-	res, _ := AllocContainerPlan(testPodInfo, 100000, 2357198848, 1)
+	res, _ := AllocContainerPlan(testPodInfo, 100000, 2357198848, 10)
 	fmt.Printf("result: %v\n", res)
-	assert.True(t, res["C2-docker-14"] == 1)
+	assert.True(t, res["C2-docker-15"] == 1)
 }
 
 func TestAllocAlgorithm(t *testing.T) {