docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wait for hijack on docker start command 

With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.

Fixed so the implementation matches with `docker run`.

This also fixes the flaky test results for TestCreateEchoStdout.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
This commit is contained in:
Tonis Tiigi 2014-10-31 01:10:35 +02:00
parent c3762c3abf
commit 79a77a396e
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api/client/commands.go
View File

@ -622,6 +622,8 @@ func (cli *DockerCli) CmdStart(args ...string) error {
return nil return nil
} }
hijacked := make(chan io.Closer)
if *attach || *openStdin { if *attach || *openStdin {
if cmd.NArg() > 1 { if cmd.NArg() > 1 {
return fmt.Errorf("You cannot start and attach multiple containers at once.") return fmt.Errorf("You cannot start and attach multiple containers at once.")
@ -658,8 +660,24 @@ func (cli *DockerCli) CmdStart(args ...string) error {
v.Set("stderr", "1") v.Set("stderr", "1")
cErr = promise.Go(func() error { cErr = promise.Go(func() error {
return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, nil, nil) return cli.hijack("POST", "/containers/"+cmd.Arg(0)+"/attach?"+v.Encode(), tty, in, cli.out, cli.err, hijacked, nil)
}) })
} else {
close(hijacked)
}
// Acknowledge the hijack before starting
select {
case closer := <-hijacked:
// Make sure that the hijack gets closed when returning (results
// in closing the hijack chan and freeing server's goroutines)
if closer != nil {
defer closer.Close()
}
case err := <-cErr:
if err != nil {
return err
}
} }
var encounteredError error var encounteredError error