p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2341 from dotcloud/1327-race_build_verbose-fix

Browse Source 
fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 8ff7b70c91387a0e868371b2b4055f57a26a057e
Component: engine
This commit is contained in:
Victor Vieux
2013-10-22 16:46:36 -07:00
parent 976a5606b2 d8ab9dfa35
commit 5c37701dc5
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/engine/buildfile.go
View File

@ -378,15 +378,22 @@ func (b *buildFile) run() (string, error) {
c.Path = b.config.Cmd[0]
c.Args = b.config.Cmd[1:]
var errCh chan error
if b.verbose {
errCh = utils.Go(func() error {
return <-c.Attach(nil, nil, b.out, b.out)
})
}
//start the container
hostConfig := &HostConfig{}
if err := c.Start(hostConfig); err != nil {
return "", err
}
if b.verbose {
err = <-c.Attach(nil, nil, b.out, b.out)
if err != nil {
if errCh != nil {
if err := <-errCh; err != nil {
return "", err
}
}

9
components/engine/container.go
View File

@ -1,6 +1,7 @@
package docker
import (
"bytes"
"encoding/json"
"errors"
"flag"
@ -847,15 +848,15 @@ func (container *Container) Start(hostConfig *HostConfig) (err error) {
// Note: The container can run and finish correctly before
// the end of this loop
for now := time.Now(); time.Since(now) < 5*time.Second; {
// If the container dies while waiting for it, just reutrn
// If the container dies while waiting for it, just return
if !container.State.Running {
return nil
}
output, err := exec.Command("lxc-info", "-n", container.ID).CombinedOutput()
output, err := exec.Command("lxc-info", "-s", "-n", container.ID).CombinedOutput()
if err != nil {
utils.Debugf("Error with lxc-info: %s (%s)", err, output)
output, err = exec.Command("lxc-info", "-n", container.ID).CombinedOutput()
output, err = exec.Command("lxc-info", "-s", "-n", container.ID).CombinedOutput()
if err != nil {
utils.Debugf("Second Error with lxc-info: %s (%s)", err, output)
return err
@ -865,7 +866,7 @@ func (container *Container) Start(hostConfig *HostConfig) (err error) {
if strings.Contains(string(output), "RUNNING") {
return nil
}
utils.Debugf("Waiting for the container to start (running: %v): %s\n", container.State.Running, output)
utils.Debugf("Waiting for the container to start (running: %v): %s", container.State.Running, bytes.TrimSpace(output))
time.Sleep(50 * time.Millisecond)
}