Merge branch 'v1.5.x' into mergify/bp/v1.5.x/pr-2680

longhorn · Apr 9, 2024 · dad9a5a · dad9a5a
2 parents 65ec907 + b160f09
commit dad9a5a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/controller/setting_controller.go b/controller/setting_controller.go
@@ -763,6 +763,8 @@ func (sc *SettingController) updateCNI() error {
 	}
 
 	nadAnnot := string(types.CNIAnnotationNetworks)
+	nadAnnotValue := types.CreateCniAnnotationFromSetting(storageNetwork)
+
 	imPodList, err := sc.ds.ListInstanceManagerPods()
 	if err != nil {
 		return errors.Wrapf(err, "failed to list instance manager Pods for %v setting update", types.SettingNameStorageNetwork)
@@ -775,10 +777,16 @@ func (sc *SettingController) updateCNI() error {
 
 	pods := append(imPodList, bimPodList...)
 	for _, pod := range pods {
-		if pod.Annotations[nadAnnot] == storageNetwork.Value {
+		if pod.Annotations[nadAnnot] == nadAnnotValue {
 			continue
 		}
 
+		logrus.WithFields(logrus.Fields{
+			"pod":      pod.Name,
+			"oldValue": pod.Annotations[nadAnnot],
+			"newValue": nadAnnotValue,
+		}).Infof("Deleting pod to update the %v annotation", nadAnnot)
+
 		if err := sc.ds.DeletePod(pod.Name); err != nil {
 			return err
 		}

diff --git a/csi/node_server.go b/csi/node_server.go
@@ -271,17 +271,17 @@ func (ns *NodeServer) nodeStageSharedVolume(volumeID, shareEndpoint, targetPath
 			if err == nil {
 				return nil
 			}
-			// Still failed.  Log with mounting node and kernel version for possible troubleshooting.  Don't step on actual mount error.
-			kernelRelease, err1 := lhns.GetKernelRelease()
-			if err1 != nil {
-				kernelRelease = err1.Error()
-			}
-			osDistro, err2 := lhns.GetOSDistro()
-			if err2 != nil {
-				osDistro = err2.Error()
-			}
-			log.WithError(err).Warnf("Failed to mount volume %v on node %s with kernel release %s, os distro %s", volumeID, ns.nodeID, kernelRelease, osDistro)
 		}
+		// Log with mounting node and kernel version for possible troubleshooting.  Don't step on actual mount error.
+		kernelRelease, err1 := lhns.GetKernelRelease()
+		if err1 != nil {
+			kernelRelease = err1.Error()
+		}
+		osDistro, err2 := lhns.GetOSDistro()
+		if err2 != nil {
+			osDistro = err2.Error()
+		}
+		log.WithError(err).Warnf("Failed to mount volume %v on node %s with kernel release %s, os distro %s", volumeID, ns.nodeID, kernelRelease, osDistro)
 		return status.Error(codes.Internal, err.Error())
 	}