CON-4285: Issues restoring Velero backups

Applying the fix from master branch to v3.0.0 branch

Signed-off-by: Rohit Balakrishna <rohit.balakrishna@hpe.com>

Author: rohit-balakrishna

pkg/driver/constants.go

@@ -96,10 +96,6 @@ const (
 	hostEncryptionSecretNamespaceKey = "hostEncryptionSecretNamespace"
 	hostEncryptionPassphraseKey      = "hostEncryptionPassphrase"
 
-	//PVC attributes propogated to the CSI
-	pvcNameAttribute = "csi.storage.k8s.io/pvc/name"
-	pvcNamespaceAttribute = "csi.storage.k8s.io/pvc/namespace"
-
 	// POD attributes propogated to the CSI
 	csiEphemeralPodName      = "csi.storage.k8s.io/pod.name"
 	csiEphemeralPodNamespace = "csi.storage.k8s.io/pod.namespace"

pkg/driver/node_server.go

@@ -517,13 +517,14 @@ func (driver *Driver) stageVolume(
 	// Store mount info in the staging device
 	stagingDevice.MountInfo = mountInfo
 
-	// CON-3010
-	// Get the PVC details to identify the datasource of PVC
-	if volumeContext[pvcNameAttribute] != "" && volumeContext[pvcNamespaceAttribute] != "" {
-		pvc, err := driver.flavor.GetPVCByName(volumeContext[pvcNameAttribute], volumeContext[pvcNamespaceAttribute])
+        // Retrieve PVC spec for dataSource inspection for regular PVCs
+	if isEphemeral(volumeContext) == false {
+		pvc, err := driver.flavor.GetPVCByVolumeID(volumeID)
+
 		if err != nil {
-			return nil, status.Error(codes.Internal, fmt.Sprintf("Error getting pvc data source for volume %v, %v", volumeID, err))
+			return nil, status.Error(codes.Internal, fmt.Sprintf("Error getting PVC from volumeID %v, %v", volumeID, err))
 		}
+
 		if pvc.Spec.DataSource != nil {
 
 			// If the DataSource is a VolumeSnapshot
@@ -533,31 +534,30 @@ func (driver *Driver) stageVolume(
 				IsVolumeClone = true
 			}
 		}
-	}
 
-	// Check whether volume is created from snapshot then only we need resize
-	if IsVolumeClone {
-		// Initialize resizeFs
-		r := mountutil.NewResizeFs(exec.New())
+		// Check whether volume is created from snapshot then only we need resize
+		if IsVolumeClone {
+			// Initialize resizeFs
+			r := mountutil.NewResizeFs(exec.New())
 
-		log.Infof("Verify whether resize required for device path %v ", device.AltFullPathName)
+			log.Infof("Verify whether resize required for device path %v ", device.AltFullPathName)
 
-		// check whether we need resize for file system
-		needResize, err := r.NeedResize(device.AltFullPathName, stagingMountPoint)
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, "Could not determine if volume %q need to be resized, error: %v", volumeID, err)
-		}
-		log.Infof("Need resize for filesystem: %v", needResize)
+			// check whether we need resize for file system
+			needResize, err := r.NeedResize(device.AltFullPathName, stagingMountPoint)
+			if err != nil {
+				return nil, status.Errorf(codes.Internal, "Could not determine if volume %q need to be resized, error: %v", volumeID, err)
+			}
+			log.Infof("Need resize for filesystem: %v", needResize)
 
-		if needResize {
-			log.Infof("Resize of target path %s is required ", device.AltFullPathName)
-			if _, err := r.Resize(device.AltFullPathName, stagingMountPoint); err != nil {
-				return nil, status.Errorf(codes.Internal, "Could not resize volume %q, error :  %v", volumeID, err)
+			if needResize {
+				log.Infof("Resize of target path %s is required ", device.AltFullPathName)
+				if _, err := r.Resize(device.AltFullPathName, stagingMountPoint); err != nil {
+					return nil, status.Errorf(codes.Internal, "Could not resize volume %q, error :  %v", volumeID, err)
+				}
+				log.Infof("Resize of target path %s is successful", device.AltFullPathName)
 			}
-			log.Infof("Resize of target path %s is successful", device.AltFullPathName)
 		}
 	}
-	// CON-3010
 
 	return stagingDevice, nil
 }

pkg/flavor/kubernetes/flavor.go

@@ -690,18 +690,36 @@ func (flavor *Flavor) getPodByName(name string, namespace string) (*v1.Pod, erro
 	return pod, nil
 }
 
-// GetPVCByName to get the PVC details for given PVC name
-func (flavor *Flavor) GetPVCByName(name string, namespace string) (*v1.PersistentVolumeClaim, error) {
-	log.Tracef(">>>>> GetPVCByName, name: %s, namespace: %s", name, namespace)
-	defer log.Trace("<<<<< GetPVCByName")
+// GetPVCByVolumeID to get the PVC details for given volumeID
+func (flavor *Flavor) GetPVCByVolumeID(id string) (*v1.PersistentVolumeClaim, error) {
+	log.Tracef(">>>>> GetPVCByVolumeID, id: %s", id)
+	defer log.Trace("<<<<< GetPVCByVolumeID")
+
+	pv, err := flavor.kubeClient.CoreV1().PersistentVolumes().Get(context.Background(), id, meta_v1.GetOptions{})
 
-	pvc, err := flavor.kubeClient.CoreV1().PersistentVolumeClaims(namespace).Get(context.Background(), name, meta_v1.GetOptions{})
 	if err != nil {
-		log.Errorf("Error retrieving the pvc %s/%s, err: %v", namespace, name, err.Error())
+		log.Errorf("Error retrieving the ID %s, err: %v", id, err.Error())
 		return nil, err
 	}
 
-	return pvc, nil
+	if pv.Spec.ClaimRef != nil {
+
+		namespace := pv.Spec.ClaimRef.Namespace
+		name := pv.Spec.ClaimRef.Name
+
+		pvc, err := flavor.kubeClient.CoreV1().PersistentVolumeClaims(namespace).Get(context.Background(), name, meta_v1.GetOptions{})
+		if err != nil {
+			log.Errorf("Error retrieving the PVC name %s in Namespace %s from claimRef of PV %s, error: %v", name, namespace, id, err.Error())
+			return nil, err
+		}
+
+		return pvc, nil
+
+	} else {
+		err := fmt.Errorf("Error retrieving the claimRef of %s", id)
+		log.Errorf("%v", err.Error())
+		return nil, err
+	}
 }
 
 // makeVolumeHandle returns csi-<sha256(podUID,volSourceSpecName)>

pkg/flavor/types.go

@@ -45,6 +45,6 @@ type Flavor interface {
 	ListVolumeAttachments() (*storage_v1.VolumeAttachmentList, error)
 	GetChapCredentials(volumeContext map[string]string) (*model.ChapInfo, error)
 	CheckConnection() bool
-	GetPVCByName(name string, namespace string) (*v1.PersistentVolumeClaim, error)
+	GetPVCByVolumeID(id string) (*v1.PersistentVolumeClaim, error)
 	HandleFileNodePublish(request *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error)
 }

pkg/flavor/vanilla/flavor.go

@@ -155,7 +155,7 @@ func (flavor *Flavor) CheckConnection() bool {
 }
 
 //nolint:revive
-func (flavor *Flavor) GetPVCByName(name string, namespace string) (*v1.PersistentVolumeClaim, error) {
+func (flavor *Flavor) GetPVCByVolumeID(id string) (*v1.PersistentVolumeClaim, error) {
 	return nil, nil
 }