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

Windows: Fix restart for Hyper-V containers

Browse source 
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
This commit is contained in:
akolomentsev 2019-02-11 16:24:09 -08:00 committed by John Howard
parent 6800954050
commit 5afe2705ac
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
daemon/restart.go
View file

@ -3,6 +3,7 @@ package daemon // import "github.com/docker/docker/daemon"
import ( import (
"fmt" "fmt"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
@ -34,11 +35,23 @@ func (daemon *Daemon) ContainerRestart(name string, seconds *int) error {
// gracefully stop, before forcefully terminating the container. If // gracefully stop, before forcefully terminating the container. If
// given a negative duration, wait forever for a graceful stop. // given a negative duration, wait forever for a graceful stop.
func (daemon *Daemon) containerRestart(container *container.Container, seconds int) error { func (daemon *Daemon) containerRestart(container *container.Container, seconds int) 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 // Avoid unnecessarily unmounting and then directly mounting
// the container when the container stops and then starts // the container when the container stops and then starts
// again // again. We do not do this for Hyper-V isolated containers
if err := daemon.Mount(container); err == nil { // (implying also on Windows) as the HCS must have exclusive
defer daemon.Unmount(container) // 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() { if container.IsRunning() {