Merge pull request k8snetworkplumbingwg#299 from adrianchiris/reset-v…

…fs-on-error-u Generic Plugin Reset interface on error
rollandf · May 9, 2022 · ca9bc8a · ca9bc8a
2 parents 26fb2b6 + facabb2
commit ca9bc8a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pkg/utils/driver.go b/pkg/utils/driver.go
@@ -96,7 +96,7 @@ func BindDefaultDriver(pciAddr string) error {
 	}
 	err = ioutil.WriteFile(sysBusPciDriversProbe, []byte(pciAddr), os.ModeAppend)
 	if err != nil {
-		glog.Errorf("BindDpdkDriver(): fail to bind driver for device %s: %s", pciAddr, err)
+		glog.Errorf("BindDefaultDriver(): fail to bind driver for device %s: %s", pciAddr, err)
 		return err
 	}
 

diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -165,7 +165,10 @@ func SyncNodeState(newState *sriovnetworkv1.SriovNetworkNodeState) error {
 					break
 				}
 				if err = configSriovDevice(&iface, &ifaceStatus); err != nil {
-					glog.Errorf("SyncNodeState(): fail to config sriov interface %s: %v", iface.PciAddress, err)
+					glog.Errorf("SyncNodeState(): fail to configure sriov interface %s: %v. resetting interface.", iface.PciAddress, err)
+					if resetErr := resetSriovDevice(ifaceStatus); resetErr != nil {
+						glog.Errorf("SyncNodeState(): fail to reset on error SR-IOV interface: %s", resetErr)
+					}
 					return err
 				}
 				break
@@ -272,7 +275,7 @@ func configSriovDevice(iface *sriovnetworkv1.Interface, ifaceStatus *sriovnetwor
 		}
 		pfLink, err := netlink.LinkByName(iface.Name)
 		if err != nil {
-			glog.Errorf("setVfGuid(): unable to get PF link for device %+v %q", iface, err)
+			glog.Errorf("configSriovDevice(): unable to get PF link for device %+v %q", iface, err)
 			return err
 		}