CON-3010 Changes for resize the filesystem for creating clone from sn…

Dockerfile

@@ -55,6 +55,8 @@ RUN ln -s /chroot/chroot-host-wrapper.sh /chroot/blkid \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.ext4 \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.xfs \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/mkfs.btrfs \
+    && ln -s /chroot/chroot-host-wrapper.sh /chroot/dumpe2fs \
+    && ln -s /chroot/chroot-host-wrapper.sh /chroot/xfs_io \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/xfs_growfs \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/xfs_repair \
     && ln -s /chroot/chroot-host-wrapper.sh /chroot/tune2fs \

pkg/driver/constants.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019,2024 Hewlett Packard Enterprise Development LP
 
 package driver
 
@@ -100,6 +100,10 @@ const (
 	hostEncryptionSecretNamespaceKey = "hostEncryptionSecretNamespace"
 	hostEncryptionPassphraseKey      = "hostEncryptionPassphrase"
 
+	//PVC attributes propogated to the CSI
+	pvcName = "csi.storage.k8s.io/pvc/name"
+	pvcNamespace = "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/controller_server.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019,2025 Hewlett Packard Enterprise Development LP
 // Copyright 2017 The Kubernetes Authors.
 
 package driver
@@ -550,12 +550,13 @@ func (driver *Driver) createVolume(
 			}
 			log.Tracef("Found parent volume: %+v", existingParentVolume)
 
+			// CON-3010 - Commented the check for clone size to allow clone resize further
 			// The requested size is must be at least equal to the snapshot's parent volume size
-			if size != existingParentVolume.Size {
+			/*if size != existingParentVolume.Size {
 				return nil,
 					status.Error(codes.InvalidArgument,
 						fmt.Sprintf("Requested clone size %d is not equal to the parent volume size %d", size, existingParentVolume.Size))
-			}
+			}*/
 
 			// Create a clone from another volume
 			log.Infof("About to create a new clone '%s' of size %v from volume %s with options %+v", name, size, existingParentVolume.ID, createOptions)

pkg/driver/node_server.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019,2024 Hewlett Packard Enterprise Development LP
 // Copyright 2017 The Kubernetes Authors.
 
 package driver
@@ -26,6 +26,9 @@ import (
 	"github.com/hpe-storage/common-host-libs/model"
 	"github.com/hpe-storage/common-host-libs/stringformat"
 	"github.com/hpe-storage/common-host-libs/util"
+	mountutil "k8s.io/mount-utils"
+	"k8s.io/utils/exec"
+
 	"k8s.io/kubernetes/pkg/volume"
 )
 
@@ -409,6 +412,8 @@ func (driver *Driver) stageVolume(
 		volumeID, stagingMountPoint, volAccessType.String(), volCap, log.MapScrubber(publishContext), volumeContext)
 	defer log.Trace("<<<<< stageVolume")
 
+	var IsVolumeClone bool
+
 	// serialize stage requests
 	stageLock.Lock()
 	defer stageLock.Unlock()
@@ -498,7 +503,54 @@ 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
+	log.Infof("PVC Name %s", volumeContext[pvcName])
+	log.Infof("PVC Namespace %s", volumeContext[pvcNamespace])
+
+	if volumeContext[pvcName] != "" && volumeContext[pvcNamespace] != "" {
+		pvc, err := driver.flavor.GetPVCByName( volumeContext[pvcName], volumeContext[pvcNamespace] )
+		if err != nil{
+			return nil, status.Error(codes.Internal, fmt.Sprintf("Error getting pvc data source for volume %v, %v", volumeID, err))
+		}
+		if pvc.Spec.DataSource != nil {
+
+			// If the DataSource is a VolumeSnapshot
+			if pvc.Spec.DataSource.Kind == "VolumeSnapshot" {
+				log.Infof("  Source Kind: VolumeSnapshot\n")
+				log.Infof("  VolumeSnapshot Name: %s\n", pvc.Spec.DataSource.Name)
+				//set to true as volume is created from volume snapshot
+				IsVolumeClone = true
+			}
+		}
+	}
+
+	// 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)
+
+		// 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: %v",  volumeID, err)
+		}
+		log.Infof("Need resize for filesystem is  %v", needResize)
 
+		// Need resize
+		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:  %v", volumeID, err)
+			}
+			log.Infof("Resize of target path %s is successful",  device.AltFullPathName)
+		}
+	}
+	// CON-3010
+
 	return stagingDevice, nil
 }
 
@@ -809,6 +861,7 @@ func (driver *Driver) NodePublishVolume(ctx context.Context, request *csi.NodePu
 		}
 	}
 
+
 	log.Infof("NodePublishVolume requested volume %s with access type %s, targetPath %s, capability %v, publishContext %v and volumeContext %v",
 		request.VolumeId, volAccessType, request.TargetPath, request.VolumeCapability, request.PublishContext, request.VolumeContext)
 

pkg/flavor/kubernetes/flavor.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019, 2024 Hewlett Packard Enterprise Development LP
 
 package kubernetes
 
@@ -686,6 +686,21 @@ 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")
+
+	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())
+		return nil, err
+	}
+
+	return pvc, nil
+}
+
+
 // makeVolumeHandle returns csi-<sha256(podUID,volSourceSpecName)>
 // Original source location: kubernetes/pkg/volume/csi/csi_mounter.go
 // TODO: Must be in-sync with k8s code

pkg/flavor/types.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019, 2024 Hewlett Packard Enterprise Development LP
 
 package flavor
 
@@ -7,6 +7,7 @@ import (
 	"github.com/hpe-storage/common-host-libs/model"
 	storage_v1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/version"
+	v1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -42,4 +43,5 @@ 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) 
 }

pkg/flavor/vanilla/flavor.go

@@ -1,4 +1,4 @@
-// Copyright 2019 Hewlett Packard Enterprise Development LP
+// Copyright 2019, 2024 Hewlett Packard Enterprise Development LP
 
 package vanilla
 
@@ -11,6 +11,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	storage_v1 "k8s.io/api/storage/v1"
+	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/version"
 )
 
@@ -120,3 +121,7 @@ func (flavor *Flavor) ListVolumeAttachments() (*storage_v1.VolumeAttachmentList,
 func (flavor *Flavor) CheckConnection() bool {
 	return false
 }
+
+func (flavor *Flavor) GetPVCByName(name string, namespace string) (*v1.PersistentVolumeClaim , error) {
+	return nil, nil
+}