Merge pull request #186 from sushanthakumar/snapshothandle-update

Update backup handle usage mechanism
soda-cdm · Jan 9, 2024 · 972ef12 · 972ef12
2 parents fe3e56d + b2ed2e7
commit 972ef12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/providerframework/volumeservice/backup/backupvolume.go b/providerframework/volumeservice/backup/backupvolume.go
@@ -476,7 +476,7 @@ func (ctrl *controller) getSnapshotBySnapshotState(
 	}
 
 	return &providerSvc.Snapshot{
-		SnapshotHandle: *csiVolSnapshotContent.Status.SnapshotHandle,
+		SnapshotHandle: csiVolSnapshotContent.Name,
 	}, nil
 }
 

diff --git a/providers/csi-snapshotter/server/server.go b/providers/csi-snapshotter/server/server.go
@@ -26,7 +26,6 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
-	"strings"
 
 	"github.com/soda-cdm/kahu/client"
 	"github.com/soda-cdm/kahu/providers/csi-snapshotter/server/options"
@@ -169,11 +168,7 @@ func (server *volBackupServer) CreateVolumeFromBackup(ctx context.Context,
 	restoreIDs := make([]*pb.RestoreVolumeIdentifier, 0)
 	for _, restoreInfo := range restoreReq.RestoreInfo {
 		log.Infof("CreateVolumeFromBackup ....%+v", restoreInfo)
-		backupHandle := restoreInfo.GetBackupIdentity().BackupHandle
-		log.Infof("CreateVolumeFromBackup backupHandle....%+v", backupHandle)
-		//bacjupHandleSplit := strings.Split(backupHandle, "@")
-		//snapshotHandle := bacjupHandleSplit[1]
-		snapshotContentName := strings.ReplaceAll(backupHandle, "snapshot", "snapcontent")
+		snapshotContentName := restoreInfo.GetBackupIdentity().BackupHandle
 		log.Infof("CreateVolumeFromBackup snapshotContentName....%+v", snapshotContentName)
 		snapshotContent, err := server.snapshotCli.SnapshotV1().
 			VolumeSnapshotContents().

diff --git a/providers/openebs-zfs/server/server.go b/providers/openebs-zfs/server/server.go
@@ -19,7 +19,6 @@ package server
 
 import (
 	"context"
-	"strings"
 
 	snapshotapi "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
 	snapshotclientset "github.com/kubernetes-csi/external-snapshotter/client/v4/clientset/versioned"
@@ -168,11 +167,7 @@ func (server *volBackupServer) CreateVolumeFromBackup(ctx context.Context,
 
 	restoreIDs := make([]*pb.RestoreVolumeIdentifier, 0)
 	for _, restoreInfo := range restoreReq.RestoreInfo {
-		backupHandle := restoreInfo.GetBackupIdentity().BackupHandle
-		bacjupHandleSplit := strings.Split(backupHandle, "@")
-		snapshotHandle := bacjupHandleSplit[1]
-		snapshotContentName := strings.ReplaceAll(snapshotHandle, "snapshot", "snapcontent")
-
+		snapshotContentName := restoreInfo.GetBackupIdentity().BackupHandle
 		snapshotContent, err := server.snapshotCli.SnapshotV1().
 			VolumeSnapshotContents().
 			Get(context.TODO(), snapshotContentName, metav1.GetOptions{})
-Original file line number
+Diff line change
@@ Expand Up / @@ -476,7 +476,7 @@ func (ctrl *controller) getSnapshotBySnapshotState( @@
     	}
     	return &providerSvc.Snapshot{
-    		SnapshotHandle: *csiVolSnapshotContent.Status.SnapshotHandle,
+    		SnapshotHandle: csiVolSnapshotContent.Name,
     	}, nil
     }
@@ Expand Down @@