Merge pull request #323 from e0ne/issues/322

Fix drain logic after node reboot

pkg/plugins/generic/generic_plugin.go

@@ -166,24 +166,26 @@ func isCommandNotFound(err error) bool {
 }
 
 func needDrainNode(desired sriovnetworkv1.Interfaces, current sriovnetworkv1.InterfaceExts) (needDrain bool) {
+	glog.V(2).Infof("generic-plugin needDrainNode(): current state '%+v', desired state '%+v'", current, desired)
 	needDrain = false
 	for _, ifaceStatus := range current {
 		configured := false
 		for _, iface := range desired {
 			if iface.PciAddress == ifaceStatus.PciAddress {
+				// TODO: no need to perform further checks if ifaceStatus.NumVfs equals to 0
+				// once https://github.com/kubernetes/kubernetes/issues/109595 will be fixed
 				configured = true
-				if ifaceStatus.NumVfs != 0 {
-					if iface.NumVfs != ifaceStatus.NumVfs {
-						glog.V(2).Infof("generic-plugin needDrainNode(): need drain, expect NumVfs %v, current NumVfs %v", iface.NumVfs, ifaceStatus.NumVfs)
-						needDrain = true
-						return
-					}
-					if iface.Mtu != 0 && iface.Mtu != ifaceStatus.Mtu {
-						glog.V(2).Infof("generic-plugin needDrainNode(): need drain, expect MTU %v, current MTU %v", iface.Mtu, ifaceStatus.Mtu)
-						needDrain = true
-						return
-					}
+				if iface.NumVfs != ifaceStatus.NumVfs {
+					glog.V(2).Infof("generic-plugin needDrainNode(): need drain, expect NumVfs %v, current NumVfs %v", iface.NumVfs, ifaceStatus.NumVfs)
+					needDrain = true
+					return
 				}
+				if iface.Mtu != 0 && iface.Mtu != ifaceStatus.Mtu {
+					glog.V(2).Infof("generic-plugin needDrainNode(): need drain, expect MTU %v, current MTU %v", iface.Mtu, ifaceStatus.Mtu)
+					needDrain = true
+					return
+				}
+				glog.V(2).Infof("generic-plugin needDrainNode(): no need drain, expect NumVfs %v, current NumVfs %v", iface.NumVfs, ifaceStatus.NumVfs)
 			}
 		}
 		if !configured && ifaceStatus.NumVfs > 0 {