e2bd8edb0d
This caused a race condition where AutoRemove could be restored before
container was considered for restart and made autoremove containers
impossible to restart.
```
$ make DOCKER_GRAPHDRIVER=vfs BIND_DIR=. TEST_FILTER='TestContainerWithAutoRemoveCanBeRestarted' TESTFLAGS='-test.count 1' test-integration
...
=== RUN TestContainerWithAutoRemoveCanBeRestarted
=== RUN TestContainerWithAutoRemoveCanBeRestarted/kill
=== RUN TestContainerWithAutoRemoveCanBeRestarted/stop
--- PASS: TestContainerWithAutoRemoveCanBeRestarted (1.61s)
--- PASS: TestContainerWithAutoRemoveCanBeRestarted/kill (0.70s)
--- PASS: TestContainerWithAutoRemoveCanBeRestarted/stop (0.86s)
PASS
DONE 3 tests in 3.062s
```
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
71 lines
2.3 KiB
Go
71 lines
2.3 KiB
Go
package daemon // import "github.com/docker/docker/daemon"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/container"
|
|
)
|
|
|
|
// ContainerRestart stops and starts a container. It attempts to
|
|
// gracefully stop the container within the given timeout, forcefully
|
|
// stopping it if the timeout is exceeded. If given a negative
|
|
// timeout, ContainerRestart will wait forever until a graceful
|
|
// stop. Returns an error if the container cannot be found, or if
|
|
// there is an underlying error at any stage of the restart.
|
|
func (daemon *Daemon) ContainerRestart(ctx context.Context, name string, options containertypes.StopOptions) error {
|
|
ctr, err := daemon.GetContainer(name)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = daemon.containerRestart(ctx, ctr, options)
|
|
if err != nil {
|
|
return fmt.Errorf("Cannot restart container %s: %v", name, err)
|
|
}
|
|
return nil
|
|
|
|
}
|
|
|
|
// containerRestart attempts to gracefully stop and then start the
|
|
// container. When stopping, wait for the given duration in seconds to
|
|
// gracefully stop, before forcefully terminating the container. If
|
|
// given a negative duration, wait forever for a graceful stop.
|
|
func (daemon *Daemon) containerRestart(ctx context.Context, container *container.Container, options containertypes.StopOptions) error {
|
|
// Determine isolation. If not specified in the hostconfig, use daemon default.
|
|
actualIsolation := container.HostConfig.Isolation
|
|
if containertypes.Isolation.IsDefault(actualIsolation) {
|
|
actualIsolation = daemon.defaultIsolation
|
|
}
|
|
|
|
// Avoid unnecessarily unmounting and then directly mounting
|
|
// the container when the container stops and then starts
|
|
// again. We do not do this for Hyper-V isolated containers
|
|
// (implying also on Windows) as the HCS must have exclusive
|
|
// access to mount the containers filesystem inside the utility
|
|
// VM.
|
|
if !containertypes.Isolation.IsHyperV(actualIsolation) {
|
|
if err := daemon.Mount(container); err == nil {
|
|
defer daemon.Unmount(container)
|
|
}
|
|
}
|
|
|
|
if container.IsRunning() {
|
|
container.Lock()
|
|
container.HasBeenManuallyRestarted = true
|
|
container.Unlock()
|
|
|
|
err := daemon.containerStop(ctx, container, options)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
if err := daemon.containerStart(container, "", "", true); err != nil {
|
|
return err
|
|
}
|
|
|
|
daemon.LogContainerEvent(container, "restart")
|
|
return nil
|
|
}
|