Merge pull request #1020 from rbradford/fix-1009

ciao-launcher: Wait for virtualizer to terminate

ciao-launcher/instance.go

@@ -223,6 +223,11 @@ func (id *instanceData) deleteCommand(cmd *insDeleteCmd) bool {
 	if id.monitorCh != nil {
 		glog.Infof("Powerdown %s before deleting", id.instance)
 		id.monitorCh <- virtualizerStopCmd{}
+		select {
+		case <-id.monitorCloseCh:
+		case <-time.After(time.Second * 10):
+			glog.Warningf("Timeout (10s) waiting for virtualizer to terminate")
+		}
 		id.vm.lostVM()
 	}
 

ciao-launcher/instance_test.go

@@ -303,6 +303,7 @@ func (v *instanceTestState) deleteInstance(t *testing.T, ovsCh chan interface{},
 				t.Errorf("Invalid monitor command found %t, expected virtualizerStopCmd", monCmd)
 				return false
 			}
+			close(v.monitorClosedCh)
 		case <-time.After(time.Second):
 			t.Error("Timed out waiting for ovsStatsUpdateCmd")
 			return false