fixes to allow restoration to volume created from snapshot

Author: Pearl1594

examples/k8s/snapshot/restore-pod.yaml

@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: restore-pod
+spec:
+  containers:
+    - name: app
+      image: busybox
+      command: [ "sleep", "3600" ]
+      volumeMounts:
+        - mountPath: /data
+          name: data
+  volumes:
+    - name: data
+      persistentVolumeClaim:
+        claimName: snapshot-pvc-1

examples/k8s/snapshot/snapshot.yaml

@@ -5,4 +5,4 @@ metadata:
 spec:
   volumeSnapshotClassName: cloudstack-snapshot
   source:
-    persistentVolumeClaimName: my-pvc
+    persistentVolumeClaimName: example-pvc

pkg/cloud/cloud.go

@@ -50,6 +50,7 @@ type Volume struct {
 type Snapshot struct {
 	ID   string
 	Name string
+	Size int64
 
 	DomainID  string
 	ProjectID string

pkg/cloud/snapshots.go

@@ -46,6 +46,7 @@ func (c *client) CreateSnapshot(ctx context.Context, volumeID string) (*Snapshot
 	snap := Snapshot{
 		ID:        snapshot.Id,
 		Name:      snapshot.Name,
+		Size:      snapshot.Virtualsize,
 		DomainID:  snapshot.Domainid,
 		ProjectID: snapshot.Projectid,
 		ZoneID:    snapshot.Zoneid,

pkg/cloud/volumes.go

@@ -169,12 +169,15 @@ func (c *client) CreateVolumeFromSnapshot(ctx context.Context, zoneID, name, dom
 		p.SetProjectid(projectID)
 	}
 	p.SetName(name)
+	p.SetSize(sizeInGB)
 	p.SetSnapshotid(snapshot.Id)
 
 	logger.V(2).Info("CloudStack API call", "command", "CreateVolume", "params", map[string]string{
 		"name":       name,
+		"size":       strconv.FormatInt(sizeInGB, 10),
 		"snapshotid": snapshotID,
 		"projectid":  projectID,
+		"zoneid":     zoneID,
 	})
 	// Execute the API call to create volume from snapshot
 	vol, err := c.Volume.CreateVolume(p)

pkg/driver/controller.go

@@ -127,6 +127,8 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
+	// If creating from snapshot, get the snapshot size
+	var snapshotSizeGiB int64
 	if snapshotID != "" {
 		logger.Info("Creating volume from snapshot", "snapshotID", snapshotID)
 		// Call the cloud connector's CreateVolumeFromSnapshot if implemented
@@ -138,17 +140,19 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 			// Error with CloudStack
 			return nil, status.Errorf(codes.Internal, "Error %v", err)
 		}
-		logger.Info("Disk offering ID", "diskOfferingID: ", diskOfferingID)
-		logger.Info("Zone ID", "ZoneID", snapshot.ZoneID)
-		logger.Info("Name", "name", name)
-		logger.Info("Domain ID", "DomainID", snapshot.DomainID)
-		logger.Info("Project ID", "ProjectID", snapshot.ProjectID)
-		logger.Info("Snapshot ID", "snapshotID", snapshotID)
-		logger.Info("Volume size", "Size", sizeInGB)
+
+		logger.Info("PVC created with", "size", sizeInGB)
+		snapshotSizeGiB = util.RoundUpBytesToGB(snapshot.Size)
+		if snapshotSizeGiB > sizeInGB {
+			logger.Info("Snapshot size is greater than the request PVC, creating volume from snapshot of size", "snapshot size:", snapshotSizeGiB)
+			sizeInGB = snapshotSizeGiB
+		}
+
 		volFromSnapshot, err := cs.connector.CreateVolumeFromSnapshot(ctx, snapshot.ZoneID, name, snapshot.DomainID, snapshot.ProjectID, snapshotID, sizeInGB)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "Cannot create volume from snapshot %s: %v", snapshotID, err.Error())
 		}
+
 		resp := &csi.CreateVolumeResponse{
 			Volume: &csi.Volume{
 				VolumeId:      volFromSnapshot.ID,