Merge branch 'dev' into 'master'

zhangye · zhangye · commit f761109f659d · 2016-10-25T16:12:36.000Z
bug fix: specs turned into  0xffffffffffffffff and make eru-core crash

因为 `createContainerWithCPUPeriod` 在创建 `goroutine` 之后就退出了，
`specs` 被销毁了，所以导致这个错误。但是根据情况不同可能会在销毁前执
行 `doCreateContainerWithCPUPeriod` 导致这个 bug 时隐时现.

See merge request !18
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.5
+0.7.6
diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go
@@ -47,7 +47,7 @@ func (c *calcium) createContainerWithCPUPeriod(specs types.Specs, opts *types.De
 		return ch, err
 	}
 
-	go func() {
+	go func(specs types.Specs, plan map[string]int, opts *types.DeployOptions) {
 		wg := sync.WaitGroup{}
 		wg.Add(len(plan))
 		for nodename, num := range plan {
@@ -60,7 +60,7 @@ func (c *calcium) createContainerWithCPUPeriod(specs types.Specs, opts *types.De
 		}
 		wg.Wait()
 		close(ch)
-	}()
+	}(specs, plan, opts)
 
 	return ch, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (c calcium) createContainerWithCPUPeriod(specs types.Specs, opts types.De`
`47`	`47`	`return ch, err`
`48`	`48`	`}`
`49`	`49`
`50`		`- go func() {`
	`50`	`+ go func(specs types.Specs, plan map[string]int, opts *types.DeployOptions) {`
`51`	`51`	`wg := sync.WaitGroup{}`
`52`	`52`	`wg.Add(len(plan))`
`53`	`53`	`for nodename, num := range plan {`
`@@ -60,7 +60,7 @@ func (c calcium) createContainerWithCPUPeriod(specs types.Specs, opts types.De`
`60`	`60`	`}`
`61`	`61`	`wg.Wait()`
`62`	`62`	`close(ch)`
`63`		`- }()`
	`63`	`+ }(specs, plan, opts)`
`64`	`64`
`65`	`65`	`return ch, nil`
`66`	`66`	`}`