kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #14547 from duglin/ErrDeadExec

Browse source 
Return 404 on exec-inspect when container is dead but exec is still around
This commit is contained in:
Alexander Morozov 2015-07-27 10:46:32 -07:00
commit 4dbdd98b41
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
daemon/exec.go
View file

@ -89,7 +89,16 @@ func (d *Daemon) registerExecCommand(execConfig *execConfig) {
} }
func (d *Daemon) getExecConfig(name string) (*execConfig, error) { func (d *Daemon) getExecConfig(name string) (*execConfig, error) {
if execConfig := d.execCommands.Get(name); execConfig != nil { execConfig := d.execCommands.Get(name)
// If the exec is found but its container is not in the daemon's list of
// containers then it must have been delete, in which case instead of
// saying the container isn't running, we should return a 404 so that
// the user sees the same error now that they will after the
// 5 minute clean-up loop is run which erases old/dead execs.
if execConfig != nil && d.containers.Get(execConfig.Container.ID) != nil {
if !execConfig.Container.IsRunning() { if !execConfig.Container.IsRunning() {
return nil, fmt.Errorf("Container %s is not running", execConfig.Container.ID) return nil, fmt.Errorf("Container %s is not running", execConfig.Container.ID)
} }

11
integration-cli/docker_cli_exec_test.go
View file

@ -369,6 +369,17 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
if sc != http.StatusOK { if sc != http.StatusOK {
c.Fatalf("received status != 200 OK: %d\n%s", sc, body) c.Fatalf("received status != 200 OK: %d\n%s", sc, body)
} }
// Now delete the container and then an 'inspect' on the exec should
// result in a 404 (not 'container not running')
out, ec := dockerCmd(c, "rm", "-f", id)
if ec != 0 {
c.Fatalf("error removing container: %s", out)
}
sc, body, err = sockRequest("GET", "/exec/"+execID+"/json", nil)
if sc != http.StatusNotFound {
c.Fatalf("received status != 404: %s\n%s", sc, body)
}
} }
func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) { func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) {