Merge pull request #221 from blackpiglet/cherry_pick_215

Fix panic when csi timeout duration is short
vmware-tanzu · Jan 2, 2024 · 18cc41e · 18cc41e
2 parents 9b2a9bb + 4eeb5a3
commit 18cc41e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/internal/util/util.go b/internal/util/util.go
@@ -266,8 +266,9 @@ func GetVolumeSnapshotContentForVolumeSnapshot(volSnap *snapshotv1api.VolumeSnap
 
 	if err != nil {
 		if err == wait.ErrWaitTimeout {
-			if snapshotContent.Status != nil && snapshotContent.Status.Error != nil {
-				log.Errorf("Timed out awaiting reconciliation of volumesnapshot, Volumesnapshotcontent %s has error: %v", snapshotContent.Name, snapshotContent.Status.Error.Message)
+			if snapshotContent != nil && snapshotContent.Status != nil && snapshotContent.Status.Error != nil {
+				log.Errorf("Timed out awaiting reconciliation of volumesnapshot, Volumesnapshotcontent %s has error: %v", snapshotContent.Name, *snapshotContent.Status.Error.Message)
+				err = fmt.Errorf("CSI got timed out with error: %v", *snapshotContent.Status.Error.Message)
 			} else {
 				log.Errorf("Timed out awaiting reconciliation of volumesnapshot %s/%s", volSnap.Namespace, volSnap.Name)
 			}