Merge pull request #548 from mlguerrero12/fixerroroverride

Fix error overwrite for setSriovNumVfs
k8snetworkplumbingwg · Nov 23, 2023 · 6445d38 · 6445d38
2 parents c54ee95 + 8a435fe
commit 6445d38
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -434,11 +434,11 @@ func configSriovDevice(iface *sriovnetworkv1.Interface, ifaceStatus *sriovnetwor
 
 			err = setSriovNumVfs(iface.PciAddress, iface.NumVfs)
 			if err != nil {
-				err = RemoveUdevRule(iface.PciAddress)
-				if err != nil {
-					return err
+				log.Log.Error(err, "configSriovDevice(): fail to set NumVfs for device", "device", iface.PciAddress)
+				errRemove := RemoveUdevRule(iface.PciAddress)
+				if errRemove != nil {
+					log.Log.Error(errRemove, "configSriovDevice(): fail to remove udev rule", "device", iface.PciAddress)
 				}
-				log.Log.Error(nil, "configSriovDevice(): fail to set NumVfs for device", "device", iface.PciAddress)
 				return err
 			}
 		}