refactor memory scheduler by sort

cluster/calcium/resource.go

@@ -3,7 +3,6 @@ package calcium
 import (
 	"context"
 	"fmt"
-	"sort"
 	"sync"
 
 	log "github.com/sirupsen/logrus"
@@ -43,7 +42,6 @@ func (c *Calcium) allocMemoryPodResource(ctx context.Context, opts *types.Deploy
 
 	cpuRate := int64(opts.CPUQuota * float64(CpuPeriodBase))
 	log.Debugf("[allocMemoryPodResource] Input opts.CPUQuota: %f, equal CPURate %d", opts.CPUQuota, cpuRate)
-	sort.Slice(nodesInfo, func(i, j int) bool { return nodesInfo[i].MemCap < nodesInfo[j].MemCap })
 	nodesInfo, err = c.scheduler.SelectMemoryNodes(nodesInfo, cpuRate, opts.Memory, opts.Count) // 还是以 Bytes 作单位， 不转换了
 	if err != nil {
 		return nil, err

scheduler/complex/potassium.go

@@ -28,40 +28,40 @@ func (m *potassium) SelectMemoryNodes(nodesInfo []types.NodeInfo, rate, memory i
 		return nil, fmt.Errorf("memory must positive")
 	}
 
-	p := -1
-	for i, nodeInfo := range nodesInfo {
-		if nodeInfo.CPURate >= rate {
-			p = i
-			break
-		}
-	}
-	if p == -1 {
+	nodesInfoLength := len(nodesInfo)
+
+	// 筛选出能满足 CPU 需求的
+	sort.Slice(nodesInfo, func(i, j int) bool { return nodesInfo[i].CPURate < nodesInfo[j].CPURate })
+	p := sort.Search(nodesInfoLength, func(i int) bool { return nodesInfo[i].CPURate >= rate })
+	// p 最大也就是 nodesInfoLength - 1
+	if p == nodesInfoLength {
 		return nil, fmt.Errorf("Cannot alloc a plan, not enough cpu rate")
 	}
-	log.Debugf("[SelectMemoryNodes] The %d th node has enough cpu rate", p)
+	nodesInfoLength -= p
+	nodesInfo = nodesInfo[p:]
+	log.Debugf("[SelectMemoryNodes] %d nodes has enough cpu rate", nodesInfoLength)
 
 	// 计算是否有足够的内存满足需求
+	sort.Slice(nodesInfo, func(i, j int) bool { return nodesInfo[i].MemCap < nodesInfo[j].MemCap })
+	p = sort.Search(nodesInfoLength, func(i int) bool { return nodesInfo[i].MemCap >= memory })
+	if p == nodesInfoLength {
+		return nil, fmt.Errorf("Cannot alloc a plan, not enough memory")
+	}
+	nodesInfoLength -= p
 	nodesInfo = nodesInfo[p:]
+	log.Debugf("[SelectMemoryNodes] %d nodes has enough memory", nodesInfoLength)
+
 	volTotal := 0
 	capacity := -1
-	p = -1
 	for i, nodeInfo := range nodesInfo {
 		capacity = int(nodeInfo.MemCap / memory)
 		if capacity > 0 {
 			volTotal += capacity
 			nodesInfo[i].Capacity = capacity
-			if p == -1 {
-				p = i
-			}
 		}
 	}
 
-	if p < 0 {
-		return nil, fmt.Errorf("No nodes provide enough memory")
-	}
-
 	// 继续裁可用节点池子
-	nodesInfo = nodesInfo[p:]
 	log.Debugf("[SelectMemoryNodes] Node info: %v", nodesInfo)
 	nodesInfo, err := CommunismDivisionPlan(nodesInfo, need, volTotal)
 	if err != nil {

scheduler/complex/potassium_test.go

@@ -641,7 +641,7 @@ func TestTestSelectMemoryNodesNotEnough(t *testing.T) {
 	_, err = k.SelectMemoryNodes(pod, 1e9, 5*1024*1024*1024, 1)
 	assert.Error(t, err)
 	if err != nil {
-		assert.Equal(t, err.Error(), "No nodes provide enough memory")
+		assert.Equal(t, err.Error(), "Cannot alloc a plan, not enough memory")
 	}
 
 	// 2 nodes [cpu not enough]