提交 d6a839b2 编写于 作者: J Jose Donizetti 提交者: Medya Ghazizadeh

Fix kvm2 vm driver remove domain

上级 0900b2b7
...@@ -459,12 +459,13 @@ func (d *Driver) Remove() error { ...@@ -459,12 +459,13 @@ func (d *Driver) Remove() error {
} }
func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error { func (d *Driver) destroyRunningDomain(dom *libvirt.Domain) error {
state, reason, err := dom.GetState() state, _, err := dom.GetState()
if err != nil { if err != nil {
return errors.Wrap(err, "getting domain state") return errors.Wrap(err, "getting domain state")
} }
if state == libvirt.DOMAIN_SHUTOFF && reason == int(libvirt.DOMAIN_SHUTOFF_DESTROYED) { // if the domain is not running, we don't destroy it
if state != libvirt.DOMAIN_RUNNING {
log.Warnf("Domain %s already destroyed, skipping...", d.MachineName) log.Warnf("Domain %s already destroyed, skipping...", d.MachineName)
return nil return nil
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册