luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #5332 from hashicorp/dani/docker_logger_container_leak

Browse source 
docker: Avoid leaking containers during Reattach
This commit is contained in:
Danielle Tomlinson 2019-02-20 22:53:06 +01:00 committed by GitHub
parent b7fad990b7 2610e2d9ef
commit b08e6e5925
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/docker/driver.go
View file

@ -199,16 +199,16 @@ func (d *Driver) RecoverTask(handle *drivers.TaskHandle) error {
h.dlogger, h.dloggerPluginClient, err = d.setupNewDockerLogger(container, handle.Config, time.Now())
if err != nil {
// TODO(dani): FIXME: Here we will leak the users container. Simply removing
// the container here will cause a user restart-stanza
// based cycle.
if err := client.StopContainer(handleState.ContainerID, 0); err != nil {
d.logger.Warn("failed to stop container during cleanup", "container_id", handleState.ContainerID, "error", err)
}
return fmt.Errorf("failed to setup replacement docker logger: %v", err)
}
if err := handle.SetDriverState(h.buildState()); err != nil {
// TODO(dani): FIXME: Here we will leak the users container. Simply removing
// the container here will cause a user restart-stanza
// based cycle.
if err := client.StopContainer(handleState.ContainerID, 0); err != nil {
d.logger.Warn("failed to stop container during cleanup", "container_id", handleState.ContainerID, "error", err)
}
return fmt.Errorf("failed to store driver state: %v", err)
}
}