File 0003-Avoid-to-return-nil-failure-message.patch of Package kubevirt

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Avoid-to-return-nil-failure-message.patch of Package kubevirt

From 4299d5a1b7f2c41c34274414f968e4212965e4ca Mon Sep 17 00:00:00 2001
From: Frank Yang <poan.yang@suse.com>
Date: Thu, 10 Mar 2022 11:56:18 +0800
Subject: [PATCH] Avoid to return nil failure message

Signed-off-by: Frank Yang <poan.yang@suse.com>
---
 pkg/virt-controller/watch/vm.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/virt-controller/watch/vm.go b/pkg/virt-controller/watch/vm.go
index a73aa8057..a8004bddd 100644
--- a/pkg/virt-controller/watch/vm.go
+++ b/pkg/virt-controller/watch/vm.go
@@ -723,8 +723,10 @@ func (c *VMController) startStop(vm *virtv1.VirtualMachine, vmi *virtv1.VirtualM
 			return nil
 		}
 		log.Log.Object(vm).Infof("%s with VMI in phase %s due to runStrategy: %s", stoppingVmMsg, vmi.Status.Phase, runStrategy)
-		err := c.stopVMI(vm, vmi)
-		return &syncErrorImpl{fmt.Errorf(failureDeletingVmiErrFormat, err), VMIFailedDeleteReason}
+		if err := c.stopVMI(vm, vmi); err != nil {
+			return &syncErrorImpl{fmt.Errorf(failureDeletingVmiErrFormat, err), VMIFailedDeleteReason}
+		}
+		return nil
 	default:
 		return &syncErrorImpl{fmt.Errorf("unknown runstrategy: %s", runStrategy), FailedCreateReason}
 	}
-- 
2.35.1

Places

File 0003-Avoid-to-return-nil-failure-message.patch of Package kubevirt

Places