opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-18 19:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7762 from mheon/maybe_this_works

Browse Source 
HTTP Attach: Wait until both STDIN and STDOUT finish
This commit is contained in:
OpenShift Merge Robot
2020-09-24 20:49:48 +00:00
committed by GitHub
parent 684cde87fa 00cca405d2
commit 90c2cc6c83
2 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libpod/oci_conmon_exec_linux.go
View File

@ -537,9 +537,6 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp
} }
}() }()
// Make a channel to pass errors back
errChan := make(chan error)
attachStdout := true attachStdout := true
attachStderr := true attachStderr := true
attachStdin := true attachStdin := true
@ -580,13 +577,16 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp
hijackWriteErrorAndClose(deferredErr, c.ID(), isTerminal, httpCon, httpBuf) hijackWriteErrorAndClose(deferredErr, c.ID(), isTerminal, httpCon, httpBuf)
}() }()
stdoutChan := make(chan error)
stdinChan := make(chan error)
// Next, STDIN. Avoid entirely if attachStdin unset. // Next, STDIN. Avoid entirely if attachStdin unset.
if attachStdin { if attachStdin {
go func() { go func() {
logrus.Debugf("Beginning STDIN copy") logrus.Debugf("Beginning STDIN copy")
_, err := utils.CopyDetachable(conn, httpBuf, detachKeys) _, err := utils.CopyDetachable(conn, httpBuf, detachKeys)
logrus.Debugf("STDIN copy completed") logrus.Debugf("STDIN copy completed")
errChan <- err stdinChan <- err
}() }()
} }
@ -613,19 +613,24 @@ func attachExecHTTP(c *Container, sessionID string, r *http.Request, w http.Resp
logrus.Debugf("Performing non-terminal HTTP attach for container %s", c.ID()) logrus.Debugf("Performing non-terminal HTTP attach for container %s", c.ID())
err = httpAttachNonTerminalCopy(conn, httpBuf, c.ID(), attachStdin, attachStdout, attachStderr) err = httpAttachNonTerminalCopy(conn, httpBuf, c.ID(), attachStdin, attachStdout, attachStderr)
} }
errChan <- err stdoutChan <- err
logrus.Debugf("STDOUT/ERR copy completed") logrus.Debugf("STDOUT/ERR copy completed")
}() }()
if cancel != nil { for {
select { select {
case err := <-errChan: case err := <-stdoutChan:
return err if err != nil {
return err
}
return nil
case err := <-stdinChan:
if err != nil {
return err
}
case <-cancel: case <-cancel:
return nil return nil
} }
} else {
var connErr error = <-errChan
return connErr
} }
} }

27
libpod/oci_conmon_linux.go
View File

@ -555,9 +555,6 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http.
return err return err
} }
// Make a channel to pass errors back
errChan := make(chan error)
attachStdout := true attachStdout := true
attachStderr := true attachStderr := true
attachStdin := true attachStdin := true
@ -672,6 +669,9 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http.
logrus.Debugf("Forwarding attach output for container %s", ctr.ID()) logrus.Debugf("Forwarding attach output for container %s", ctr.ID())
stdoutChan := make(chan error)
stdinChan := make(chan error)
// Handle STDOUT/STDERR // Handle STDOUT/STDERR
go func() { go func() {
var err error var err error
@ -690,7 +690,7 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http.
logrus.Debugf("Performing non-terminal HTTP attach for container %s", ctr.ID()) logrus.Debugf("Performing non-terminal HTTP attach for container %s", ctr.ID())
err = httpAttachNonTerminalCopy(conn, httpBuf, ctr.ID(), attachStdin, attachStdout, attachStderr) err = httpAttachNonTerminalCopy(conn, httpBuf, ctr.ID(), attachStdin, attachStdout, attachStderr)
} }
errChan <- err stdoutChan <- err
logrus.Debugf("STDOUT/ERR copy completed") logrus.Debugf("STDOUT/ERR copy completed")
}() }()
// Next, STDIN. Avoid entirely if attachStdin unset. // Next, STDIN. Avoid entirely if attachStdin unset.
@ -698,20 +698,25 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http.
go func() { go func() {
_, err := utils.CopyDetachable(conn, httpBuf, detach) _, err := utils.CopyDetachable(conn, httpBuf, detach)
logrus.Debugf("STDIN copy completed") logrus.Debugf("STDIN copy completed")
errChan <- err stdinChan <- err
}() }()
} }
if cancel != nil { for {
select { select {
case err := <-errChan: case err := <-stdoutChan:
return err if err != nil {
return err
}
return nil
case err := <-stdinChan:
if err != nil {
return err
}
case <-cancel: case <-cancel:
return nil return nil
} }
} else {
var connErr error = <-errChan
return connErr
} }
} }