From fb17970ba42c314a387cd88ddf6868b4d22c49c8 Mon Sep 17 00:00:00 2001 From: Eric Weber Date: Fri, 12 Jan 2024 14:15:51 +0800 Subject: [PATCH 1/2] fix(storage-network): annotated pod in creation loop longhorn-7640 Co-authored-by: Chin-Ya Huang Signed-off-by: Eric Weber (cherry picked from commit 43e997cbcf3930e9470b8060d26a964e61371726) --- controller/setting_controller.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/controller/setting_controller.go b/controller/setting_controller.go index 2b0c95c950..a68c8db523 100644 --- 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 } From b160f094c2eea326bcb057f5eb7ff91a5e753721 Mon Sep 17 00:00:00 2001 From: James Munson Date: Tue, 2 Apr 2024 14:47:35 -0600 Subject: [PATCH 2/2] fix(csi): correct error found in test. Signed-off-by: James Munson (cherry picked from commit 89b455524e828fb7d2b2abe547b9e101537b122b) --- csi/node_server.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/csi/node_server.go b/csi/node_server.go index 21bcf5c47a..4891929990 100644 --- 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()) }