Merge branch 'debug' into 'master'

fix a bug: not use complex scheduler

See merge request !63

Author: zhangye

VERSION

@@ -1 +1 @@
-0.7.19
+0.7.20

cluster/calcium/cluster.go

@@ -4,7 +4,7 @@ import (
 	"gitlab.ricebook.net/platform/core/network"
 	"gitlab.ricebook.net/platform/core/network/calico"
 	"gitlab.ricebook.net/platform/core/scheduler"
-	"gitlab.ricebook.net/platform/core/scheduler/simple"
+	"gitlab.ricebook.net/platform/core/scheduler/complex"
 	"gitlab.ricebook.net/platform/core/source"
 	"gitlab.ricebook.net/platform/core/source/gitlab"
 	"gitlab.ricebook.net/platform/core/store"
@@ -32,9 +32,10 @@ func New(config types.Config) (*calcium, error) {
 		return nil, err
 	}
 
-	// TODO 这里必须要用到scheduler, 要用丫的RandomNode方法
-	// 所以先给个simple吧
-	scheduler := simplescheduler.New()
+	scheduler, err := complexscheduler.New(config)
+	if err != nil {
+		return nil, err
+	}
 	titanium := calico.New()
 	source := gitlab.New(config)
 

cluster/calcium/create_container.go

@@ -23,9 +23,7 @@ import (
 // Use specs and options to create
 // TODO what about networks?
 func (c *calcium) CreateContainer(specs types.Specs, opts *types.DeployOptions) (chan *types.CreateContainerMessage, error) {
-	log.Debugf("Deploy container with specs %v, deploy options %v", specs, opts)
 	pod, _ := c.store.GetPod(opts.Podname)
-	log.Debugf("Deplay scheduler: %s", pod.Scheduler)
 	if pod.Scheduler == "CPU" {
 		return c.createContainerWithScheduler(specs, opts)
 	} else {
@@ -302,15 +300,16 @@ func (c *calcium) getCPUAndMem(podname, nodename string, quota float64) (map[str
 // Later if any error occurs, these nodes can be restored.
 func (c *calcium) prepareNodes(podname, nodename string, quota float64, num int) (map[string][]types.CPUMap, error) {
 	result := make(map[string][]types.CPUMap)
-
+	log.Debugf("Input parameters podname: %s, nodename: %s, quota: %f, num: %d", podname, nodename, quota, num)
 	cpuandmem, nodes, err := c.getCPUAndMem(podname, nodename, quota)
 	if err != nil {
 		return result, err
 	}
 	cpumap := makeCPUMap(cpuandmem) // 做这个转换，免得改太多
 	// use podname as lock key to prevent scheduling on the same node at one time
+	log.Debugf("Cpumap: %v", cpumap)
 	result, changed, err := c.scheduler.SelectNodes(cpumap, quota, num) // 这个接口统一使用float64了
-	log.Debugf("result: %v, changed: %v", result, changed)
+	log.Debugf("Result: %v, Changed: %v", result, changed)
 	if err != nil {
 		return result, err
 	}
@@ -321,7 +320,6 @@ func (c *calcium) prepareNodes(podname, nodename string, quota float64, num int)
 		// cpus changeded
 		// update data to etcd
 		// `SelectNodes` reduces count in cpumap
-		log.WithFields(log.Fields{"changed": changed}).Debugln("Changed nodes are:")
 		for _, node := range nodes {
 			r, ok := changed[node.Name]
 			// 不在changed里说明没有变化
@@ -479,7 +477,7 @@ func (c *calcium) doCreateContainerWithScheduler(nodename string, cpumap []types
 // no need to update this to etcd (save 1 time write on etcd)
 func (c *calcium) releaseQuota(node *types.Node, quota types.CPUMap) {
 	if quota.Total() == 0 {
-		log.Debug("cpu quota is zero: %v", quota)
+		log.Debug("cpu quota is zero: %f", quota)
 		return
 	}
 	c.store.UpdateNodeCPU(node.Podname, node.Name, quota, "+")

scheduler/complex/cpu.go

@@ -232,7 +232,6 @@ func averagePlan(cpu float64, nodes map[string]types.CPUMap, need, maxShareCore,
 
 	// 决定分配方案
 	allocplan := allocPlan(nodeinfo, need)
-
 	for node, ncon := range allocplan {
 		if ncon > 0 {
 			nodename = nodeinfo[node].Node

scheduler/complex/potassium.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"path/filepath"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/client"
 	"gitlab.ricebook.net/platform/core/lock"
 	"gitlab.ricebook.net/platform/core/lock/etcdlock"
@@ -58,9 +57,6 @@ func (m *potassium) RandomNode(nodes map[string]types.CPUMap) (string, error) {
 func (m *potassium) SelectNodes(nodes map[string]types.CPUMap, quota float64, num int) (map[string][]types.CPUMap, map[string]types.CPUMap, error) {
 	m.Lock()
 	defer m.Unlock()
-	log.Debugf("[SelectNodes] nodes: %v", nodes)
-	log.Debugf("[SelectNodes] quota: %f", quota)
-
 	result := make(map[string][]types.CPUMap)
 	changed := make(map[string]types.CPUMap)
 
@@ -72,7 +68,6 @@ func (m *potassium) SelectNodes(nodes map[string]types.CPUMap, quota float64, nu
 	// suppose each core has 10 coreShare
 	// TODO: change it to be control by parameters
 	result = averagePlan(quota, nodes, num, -1, 10)
-	log.Debugf("[SelectNodes] averagePlan: %v", result)
 	if result == nil {
 		return nil, nil, fmt.Errorf("Not enough resource")
 	}

scheduler/complex/potassium_test.go

@@ -48,6 +48,10 @@ func TestSelectNodes(t *testing.T) {
 		},
 	}
 
+	debug, changed, _ := k.SelectNodes(nodes, 0.5, 1)
+	fmt.Printf("algorithm debug res: %v", debug)
+	fmt.Printf("algorithm debug changed: %v", changed)
+
 	_, _, err = k.SelectNodes(nodes, 2, 3)
 	assert.Error(t, err)
 	assert.Contains(t, err.Error(), "Not enough")