kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7160 from kubernetes/stop-retry 

hyperv Delete: call StopHost before removing VM
pull/7176/head
Thomas Strömberg 2020-03-23 15:48:40 -07:00 committed by GitHub
parent 84d3dc3085 14f8ee3984
commit 679b0c6c72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/minikube/cmd/delete.go
View File

@ -402,7 +402,7 @@ func deleteProfileDirectory(profile string) {
out.T(out.DeletingHost, `Removing {{.directory}} ...`, out.V{"directory": machineDir}) out.T(out.DeletingHost, `Removing {{.directory}} ...`, out.V{"directory": machineDir})
err := os.RemoveAll(machineDir) err := os.RemoveAll(machineDir)
if err != nil { if err != nil {
exit.WithError("Unable to remove machine directory: %v", err) exit.WithError("Unable to remove machine directory", err)
} }
} }
} }

18
pkg/minikube/machine/delete.go
View File

@ -75,18 +75,26 @@ func DeleteHost(api libmachine.API, machineName string) error {
return mcnerror.ErrHostDoesNotExist{Name: machineName} return mcnerror.ErrHostDoesNotExist{Name: machineName}
} }
// This is slow if SSH is not responding, but HyperV hangs otherwise, See issue #2914 // Hyper-V requires special care to avoid ACPI and file locking issues
if host.Driver.DriverName() == driver.HyperV { if host.Driver.DriverName() == driver.HyperV {
if err := trySSHPowerOff(host); err != nil { if err := StopHost(api, machineName); err != nil {
glog.Infof("Unable to power off minikube because the host was not found.") glog.Warningf("stop host: %v", err)
} }
out.T(out.DeletingHost, "Successfully powered off Hyper-V. minikube driver -- {{.driver}}", out.V{"driver": host.Driver.DriverName()}) // Hack: give the Hyper-V VM more time to stop before deletion
time.Sleep(1 * time.Second)
} }
out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": host.DriverName}) out.T(out.DeletingHost, `Deleting "{{.profile_name}}" in {{.driver_name}} ...`, out.V{"profile_name": machineName, "driver_name": host.DriverName})
if err := host.Driver.Remove(); err != nil { if err := host.Driver.Remove(); err != nil {
return errors.Wrap(err, "host remove") glog.Warningf("remove failed, will retry: %v", err)
time.Sleep(2 * time.Second)
nerr := host.Driver.Remove()
if nerr != nil {
return errors.Wrap(nerr, "host remove retry")
}
} }
if err := api.Remove(machineName); err != nil { if err := api.Remove(machineName); err != nil {
return errors.Wrap(err, "api remove") return errors.Wrap(err, "api remove")
} }