add logs for devices verification

Signed-off-by: Sebastian Sch <sebassch@gmail.com>
k8snetworkplumbingwg · May 2, 2024 · f642749 · f642749
1 parent 047114b
commit f642749
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 41 deletions.
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -322,52 +322,55 @@ func (dn *Daemon) nodeStateSyncHandler() error {
 		}
 	}
 
-	if vars.UsingSystemdMode && dn.currentNodeState.GetGeneration() == latest && !dn.isDrainCompleted() {
-		serviceEnabled, err := dn.HostHelpers.IsServiceEnabled(systemd.SriovServicePath)
-		if err != nil {
-			log.Log.Error(err, "nodeStateSyncHandler(): failed to check if sriov-config service exist on host")
-			return err
-		}
-		postNetworkServiceEnabled, err := dn.HostHelpers.IsServiceEnabled(systemd.SriovPostNetworkServicePath)
-		if err != nil {
-			log.Log.Error(err, "nodeStateSyncHandler(): failed to check if sriov-config-post-network service exist on host")
-			return err
-		}
-
-		// if the service doesn't exist we should continue to let the k8s plugin to create the service files
-		// this is only for k8s base environments, for openshift the sriov-operator creates a machine config to will apply
-		// the system service and reboot the node the config-daemon doesn't need to do anything.
-		if !(serviceEnabled && postNetworkServiceEnabled) {
-			sriovResult = &systemd.SriovResult{SyncStatus: consts.SyncStatusFailed,
-				LastSyncError: fmt.Sprintf("some sriov systemd services are not available on node: "+
-					"sriov-config available:%t, sriov-config-post-network available:%t", serviceEnabled, postNetworkServiceEnabled)}
-		} else {
-			sriovResult, err = systemd.ReadSriovResult()
+	// if the operator complete the drain operator we should continue the configuration
+	if !dn.isDrainCompleted() {
+		if vars.UsingSystemdMode && dn.currentNodeState.GetGeneration() == latest {
+			serviceEnabled, err := dn.HostHelpers.IsServiceEnabled(systemd.SriovServicePath)
 			if err != nil {
-				log.Log.Error(err, "nodeStateSyncHandler(): failed to load sriov result file from host")
+				log.Log.Error(err, "nodeStateSyncHandler(): failed to check if sriov-config service exist on host")
+				return err
+			}
+			postNetworkServiceEnabled, err := dn.HostHelpers.IsServiceEnabled(systemd.SriovPostNetworkServicePath)
+			if err != nil {
+				log.Log.Error(err, "nodeStateSyncHandler(): failed to check if sriov-config-post-network service exist on host")
 				return err
 			}
-		}
-		if sriovResult.LastSyncError != "" || sriovResult.SyncStatus == consts.SyncStatusFailed {
-			log.Log.Info("nodeStateSyncHandler(): sync failed systemd service error", "last-sync-error", sriovResult.LastSyncError)
 
-			// add the error but don't requeue
-			dn.refreshCh <- Message{
-				syncStatus:    consts.SyncStatusFailed,
-				lastSyncError: sriovResult.LastSyncError,
+			// if the service doesn't exist we should continue to let the k8s plugin to create the service files
+			// this is only for k8s base environments, for openshift the sriov-operator creates a machine config to will apply
+			// the system service and reboot the node the config-daemon doesn't need to do anything.
+			if !(serviceEnabled && postNetworkServiceEnabled) {
+				sriovResult = &systemd.SriovResult{SyncStatus: consts.SyncStatusFailed,
+					LastSyncError: fmt.Sprintf("some sriov systemd services are not available on node: "+
+						"sriov-config available:%t, sriov-config-post-network available:%t", serviceEnabled, postNetworkServiceEnabled)}
+			} else {
+				sriovResult, err = systemd.ReadSriovResult()
+				if err != nil {
+					log.Log.Error(err, "nodeStateSyncHandler(): failed to load sriov result file from host")
+					return err
+				}
+			}
+			if sriovResult.LastSyncError != "" || sriovResult.SyncStatus == consts.SyncStatusFailed {
+				log.Log.Info("nodeStateSyncHandler(): sync failed systemd service error", "last-sync-error", sriovResult.LastSyncError)
+
+				// add the error but don't requeue
+				dn.refreshCh <- Message{
+					syncStatus:    consts.SyncStatusFailed,
+					lastSyncError: sriovResult.LastSyncError,
+				}
+				<-dn.syncCh
+				return nil
 			}
-			<-dn.syncCh
-			return nil
 		}
-	}
 
-	skip, err := dn.shouldSkipReconciliation(dn.desiredNodeState)
-	if err != nil {
-		return err
-	}
-	// Reconcile only when there are changes in the spec or status of managed VFs.
-	if skip {
-		return nil
+		skip, err := dn.shouldSkipReconciliation(dn.desiredNodeState)
+		if err != nil {
+			return err
+		}
+		// Reconcile only when there are changes in the spec or status of managed VFs.
+		if skip {
+			return nil
+		}
 	}
 
 	dn.refreshCh <- Message{
@@ -539,6 +542,7 @@ func (dn *Daemon) nodeStateSyncHandler() error {
 }
 
 func (dn *Daemon) shouldSkipReconciliation(latestState *sriovnetworkv1.SriovNetworkNodeState) (bool, error) {
+	log.Log.V(0).Info("shouldSkipReconciliation()")
 	var err error
 
 	// Skip when SriovNetworkNodeState object has just been created.
@@ -563,15 +567,18 @@ func (dn *Daemon) shouldSkipReconciliation(latestState *sriovnetworkv1.SriovNetw
 		return true, nil
 	}
 
-	// Verify changes in the spec of the SriovNetworkNodeState CR.
-	if dn.currentNodeState.GetGeneration() == latestState.GetGeneration() && !dn.isDrainCompleted() {
+	// Verify changes in the status of the SriovNetworkNodeState CR.
+	if dn.currentNodeState.GetGeneration() == latestState.GetGeneration() {
+		log.Log.V(0).Info("shouldSkipReconciliation() verifying status change")
 		for _, p := range dn.loadedPlugins {
 			// Verify changes in the status of the SriovNetworkNodeState CR.
+			log.Log.V(0).Info("shouldSkipReconciliation(): verifying status change for plugin", "pluginName", p.Name())
 			changed, err := p.CheckStatusChanges(latestState)
 			if err != nil {
 				return false, err
 			}
 			if changed {
+				log.Log.V(0).Info("shouldSkipReconciliation(): plugin require change", "pluginName", p.Name())
 				return false, nil
 			}
 		}

diff --git a/pkg/plugins/generic/generic_plugin.go b/pkg/plugins/generic/generic_plugin.go
@@ -167,6 +167,11 @@ func (p *GenericPlugin) CheckStatusChanges(current *sriovnetworkv1.SriovNetworkN
 		return false, err
 	}
 
+	if len(missingKernelArgs) != 0 {
+		log.Log.V(0).Info("generic-plugin CheckStatusChanges(): kernel args missing",
+			"kernelArgs", missingKernelArgs)
+	}
+
 	return len(missingKernelArgs) != 0, nil
 }