containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Stop machine before force removing files 

In #13466 the ability to force remove a machine while it's running was
added but it did not first stop the machine, all files get deleted but
the qemu VM would essentially be orphaned.

[NO NEW TESTS NEEDED]

Signed-off-by: Shane Smith <shane.smith@shopify.com>
This commit is contained in:
Shane Smith 2022-06-02 16:34:02 -04:00
parent 570c2492a3
commit b8de285a42
No known key found for this signature in database
GPG Key ID: 1979307CCBF452DA
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/machine/qemu/machine.go
View File

@ -831,8 +831,14 @@ func (v *MachineVM) Remove(_ string, opts machine.RemoveOptions) (string, func()
if err != nil { if err != nil {
return "", nil, err return "", nil, err
} }
if state == machine.Running && !opts.Force { if state == machine.Running {
return "", nil, errors.Errorf("running vm %q cannot be destroyed", v.Name) if !opts.Force {
return "", nil, errors.Errorf("running vm %q cannot be destroyed", v.Name)
}
err := v.Stop(v.Name, machine.StopOptions{})
if err != nil {
return "", nil, err
}
} }
// Collect all the files that need to be destroyed // Collect all the files that need to be destroyed