Skip to content

Commit

Permalink
Fix kvm remove when domain is not running
Browse files Browse the repository at this point in the history
  • Loading branch information
josedonizetti committed May 24, 2019
1 parent faf9496 commit 80d02ad
Showing 1 changed file with 27 additions and 8 deletions.
35 changes: 27 additions & 8 deletions pkg/drivers/kvm/kvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -443,15 +443,34 @@ func (d *Driver) Remove() error {
dom, err := conn.LookupDomainByName(d.MachineName)
if err != nil {
log.Warn("Domain %s does not exist, nothing to clean up...", d.MachineName)
return nil
}
if dom != nil {
log.Infof("Domain %s exists, removing...", d.MachineName)
if err := dom.Destroy(); err != nil {
return err
}
if err := dom.Undefine(); err != nil {
return err
}

log.Infof("Domain %s exists, removing...", d.MachineName)
if err := d.destroyRunningDomain(dom); err != nil {
return err
}

if err := dom.Undefine(); err != nil {
return err
}

return nil
}

func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error {
state, reason, err := dom.GetState()
if err != nil {
return errors.Wrap(err, "getting domain state")
}

if state == libvirt.DOMAIN_SHUTOFF && reason == int(libvirt.DOMAIN_SHUTOFF_DESTROYED) {
log.Warnf("Domain %s already destroyed, skipping...", d.MachineName)
return nil
}

if err := dom.Destroy(); err != nil {
return errors.Wrap(err, "destroying running domain")
}

return nil
Expand Down

0 comments on commit 80d02ad

Please sign in to comment.