Merge branch 'debug' into 'master'

添加了更多debug log; 去掉分配算法随机化部分



See merge request !19

Author: zhangye

cluster/calcium/create_container.go

@@ -50,9 +50,18 @@ func (c *calcium) createContainerWithCPUPeriod(specs types.Specs, opts *types.De
 	go func(specs types.Specs, plan map[string]int, opts *types.DeployOptions) {
 		wg := sync.WaitGroup{}
 		wg.Add(len(plan))
+		log.Debugf("alloc plan: %v", plan)
 		for nodename, num := range plan {
+			log.Debugf("nodename outside doCreate goroutine: %s", nodename)
+			log.Debugf("num outside doCreate goroutine: %d", num)
+			log.Debugf("specs outside: %v", specs)
+			log.Debugf("opts outside: %v", opts)
 			go func(nodename string, num int, opts *types.DeployOptions) {
 				defer wg.Done()
+				log.Debugf("nodename inside doCreate goroutine: %s", nodename)
+				log.Debugf("num insid doCreate goroutine: %d", num)
+				log.Debugf("specs inside: %v", specs)
+				log.Debugf("opts inside: %v", opts)
 				for _, m := range c.doCreateContainerWithCPUPeriod(nodename, num, opts.CPUQuota, specs, opts) {
 					ch <- m
 				}

utils/utils.go

@@ -175,9 +175,11 @@ func allocAlgorithm(info []int, need int) map[int]int {
 				result[j] += ave
 			}
 			if more > 0 {
-				n, _ := rand.Int(rand.Reader, big.NewInt(int64(nodeToUse)))
+				// TODO : 这里应该要有一个随机策略但是我之前的随机策略是有问题的
+				//        cmgs 提供了一个思路: 如果当前需要分配的容器数量少于最
+				//        小机器的容量的话，我们就直接随机分
 				more--
-				result[j+int(n.Int64())]--
+				result[j]--
 			} else if more < 0 {
 				info[j] -= ave
 			}

utils/utils_test.go

@@ -74,6 +74,21 @@ func TestContinuousAddingContainer(t *testing.T) {
 	}
 }
 
+func TestAlgorithm(t *testing.T) {
+	testPodInfo := ByCoreNum{}
+	node1 := NodeInfo{"n1", 30000, 5 * 512 * 1024 * 1024}
+	node2 := NodeInfo{"n2", 30000, 5 * 512 * 1024 * 1024}
+	node3 := NodeInfo{"n3", 30000, 5 * 512 * 1024 * 1024}
+	node4 := NodeInfo{"n3", 30000, 5 * 512 * 1024 * 1024}
+	testPodInfo = append(testPodInfo, node1)
+	testPodInfo = append(testPodInfo, node2)
+	testPodInfo = append(testPodInfo, node3)
+	testPodInfo = append(testPodInfo, node4)
+
+	res1, _ := AllocContainerPlan(testPodInfo, 10000, 512*1024*1024, 1)
+	fmt.Println(res1)
+}
+
 func TestAllocContainerPlan(t *testing.T) {
 	testPodInfo := ByCoreNum{}
 	node1 := NodeInfo{"n1", 30000, 512 * 1024 * 1024}