Merge pull request #122 from sp-yduck/fix/overcommit-plugin

calculate overcommit ratio with only running qemu

Author: sp-yduck

cloud/scheduler/plugins/overcommit/cpu_overcommit.go

@@ -23,7 +23,7 @@ func (pl *CPUOvercommit) Name() string {
 }
 
 // filter by cpu overcommit ratio
-func (pl *CPUOvercommit) Filter(ctx context.Context, _ *framework.CycleState, config api.VirtualMachineCreateOptions, nodeInfo *framework.NodeInfo) *framework.Status {
+func (pl *CPUOvercommit) Filter(ctx context.Context, state *framework.CycleState, config api.VirtualMachineCreateOptions, nodeInfo *framework.NodeInfo) *framework.Status {
 	cpu := sumCPUs(nodeInfo.QEMUs())
 	maxCPU := nodeInfo.Node().MaxCpu
 	sockets := config.Sockets
@@ -34,15 +34,19 @@ func (pl *CPUOvercommit) Filter(ctx context.Context, _ *framework.CycleState, co
 	if ratio > defaultCPUOvercommitRatio {
 		status := framework.NewStatus()
 		status.SetCode(1)
+		state.SetMessage(pl.Name(), "exceed cpu overcommit ratio")
 		return status
 	}
 	return &framework.Status{}
 }
 
+// sum cpus of all 'running' qemu
 func sumCPUs(qemus []*api.VirtualMachine) int {
 	var result int
 	for _, q := range qemus {
-		result += q.Cpus
+		if q.Status == api.ProcessStatusRunning {
+			result += q.Cpus
+		}
 	}
 	return result
 }

cloud/scheduler/plugins/overcommit/memory_overcommit.go

@@ -23,22 +23,26 @@ func (pl *MemoryOvercommit) Name() string {
 }
 
 // filter by memory overcommit ratio
-func (pl *MemoryOvercommit) Filter(ctx context.Context, _ *framework.CycleState, config api.VirtualMachineCreateOptions, nodeInfo *framework.NodeInfo) *framework.Status {
+func (pl *MemoryOvercommit) Filter(ctx context.Context, state *framework.CycleState, config api.VirtualMachineCreateOptions, nodeInfo *framework.NodeInfo) *framework.Status {
 	mem := sumMems(nodeInfo.QEMUs())
 	maxMem := nodeInfo.Node().MaxMem
 	ratio := float32(mem+1024*1024*config.Memory) / float32(maxMem)
 	if ratio >= defaultMemoryOvercommitRatio {
 		status := framework.NewStatus()
 		status.SetCode(1)
+		state.SetMessage(pl.Name(), "exceed memory overcommit ratio")
 		return status
 	}
 	return &framework.Status{}
 }
 
+// sum maxmem of all 'running' qemu
 func sumMems(qemus []*api.VirtualMachine) int {
 	var result int
 	for _, q := range qemus {
-		result += q.MaxMem
+		if q.Status == api.ProcessStatusRunning {
+			result += q.MaxMem
+		}
 	}
 	return result
 }