Better handle force delete scenario with unified controllers

Signed-off-by: Roman Mohr <[email protected]>
guangxuli · Oct 27, 2017 · d6852d0 · d6852d0
1 parent 6bb2ee5
commit d6852d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pkg/virt-handler/vm.go b/pkg/virt-handler/vm.go
@@ -347,7 +347,7 @@ func (d *VirtualMachineController) execute(key string) error {
 
 	// Process the VM only if the current phases are in sync
 	var syncErr error
-	if vm.Status.Phase == d.calculateVmPhaseForStatusReason(domain, vm) {
+	if vm.Status.Phase == d.calculateVmPhaseForStatusReason(domain, vm) || !exists {
 		syncErr = d.processVmUpdate(vm.DeepCopy(), shouldDeleteVm)
 		if syncErr != nil {
 			d.recorder.Event(vm, k8sv1.EventTypeWarning, v1.SyncFailed.String(), syncErr.Error())

diff --git a/pkg/virt-handler/vm_test.go b/pkg/virt-handler/vm_test.go
@@ -111,7 +111,7 @@ var _ = Describe("VM", func() {
 
 	Context("VM controller gets informed about a Domain change through the Domain controller", func() {
 
-		It("should kill the Domain if no cluster wide equivalent exists", func() {
+		It("should delete non-running Domains if no cluster wide equivalent exists", func() {
 			domain := api.NewMinimalDomain("testvm")
 			domainFeeder.Add(domain)
 			vmInterface.EXPECT().Get("testvm", gomock.Any()).Return(nil, errors.NewNotFound(schema.GroupResource{}, ""))
@@ -122,6 +122,18 @@ var _ = Describe("VM", func() {
 			controller.Execute()
 		})
 
+		It("should delete running Domains if no cluster wide equivalent exists", func() {
+			domain := api.NewMinimalDomain("testvm")
+			domain.Status.Status = api.Running
+			domainFeeder.Add(domain)
+			vmInterface.EXPECT().Get("testvm", gomock.Any()).Return(nil, errors.NewNotFound(schema.GroupResource{}, ""))
+
+			domainManager.EXPECT().RemoveVMSecrets(v1.NewVMReferenceFromName("testvm")).Return(nil)
+			domainManager.EXPECT().KillVM(v1.NewVMReferenceFromName("testvm"))
+
+			controller.Execute()
+		})
+
 		It("should leave the Domain alone if the VM is migrating to its host", func() {
 			vm := v1.NewMinimalVM("testvm")
 			vm.Status.MigrationNodeName = "master"