From e466ee9479fc8254289c36ff889cc64aef4aa832 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Tue, 19 Jan 2016 16:16:45 +0100 Subject: [PATCH] Fix infinite loop when deleting machine in ultra weird state Signed-off-by: Jean-Laurent de Morlhon --- drivers/virtualbox/virtualbox.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go index ad12955d6a..d66e35a019 100644 --- a/drivers/virtualbox/virtualbox.go +++ b/drivers/virtualbox/virtualbox.go @@ -615,7 +615,7 @@ func (d *Driver) Kill() error { } func (d *Driver) Remove() error { - s, err := d.GetState() + _, err := d.GetState() if err != nil { if err == ErrMachineNotExist { log.Infof("machine does not exist, assuming it has been removed already") @@ -623,14 +623,8 @@ func (d *Driver) Remove() error { } return err } - if s == state.Running { - if err := d.Stop(); err != nil { - return err - } - } else if s != state.Stopped { - if err := d.Kill(); err != nil { - return err - } + if err := d.Kill(); err != nil { + return err } // vbox will not release it's lock immediately after the stop d.sleeper.Sleep(1 * time.Second)