beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38782 from Microsoft/fix-restart

Browse source 
Windows: Fix restart for Hyper-V containers
This commit is contained in:
John Howard 2019-02-26 22:44:36 -08:00 committed by GitHub
commit de7172b600
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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 (
"fmt"
containertypes "github.com/docker/docker/api/types/container"
"github.com/docker/docker/container"
"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
// given a negative duration, wait forever for a graceful stop.
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
// the container when the container stops and then starts
// again
if err := daemon.Mount(container); err == nil {
defer daemon.Unmount(container)
// 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() {