review comment: change the key to ZFSSrcVolKey

Signed-off-by: Pawan <[email protected]>
openebs · Nov 11, 2020 · 3916521 · 3916521
1 parent 767f912
commit 3916521
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -191,7 +191,7 @@ func CreateVolClone(req *csi.CreateVolumeRequest, srcVol string) (string, error)
 
 	selected := vol.Spec.OwnerNodeID
 
-	labels := map[string]string{zfs.ZFSVolKey: vol.Name}
+	labels := map[string]string{zfs.ZFSSrcVolKey: vol.Name}
 
 	// create the clone from the source volume
 

diff --git a/pkg/zfs/volume.go b/pkg/zfs/volume.go
@@ -39,6 +39,8 @@ const (
 	ZFSFinalizer string = "zfs.openebs.io/finalizer"
 	// ZFSVolKey for the ZfsSnapshot CR to store Persistence Volume name
 	ZFSVolKey string = "openebs.io/persistent-volume"
+	// ZFSSrcVolKey key for the source Volume name
+	ZFSSrcVolKey string = "openebs.io/source-volume"
 	// PoolNameKey is key for ZFS pool name
 	PoolNameKey string = "openebs.io/poolname"
 	// ZFSNodeKey will be used to insert Label in ZfsVolume CR

diff --git a/pkg/zfs/zfs_util.go b/pkg/zfs/zfs_util.go
@@ -401,7 +401,7 @@ func CreateVolume(vol *apis.ZFSVolume) error {
 func CreateClone(vol *apis.ZFSVolume) error {
 	volume := vol.Spec.PoolName + "/" + vol.Name
 
-	if srcVol, ok := vol.Labels[ZFSVolKey]; ok {
+	if srcVol, ok := vol.Labels[ZFSSrcVolKey]; ok {
 		// datasource is volume, create the snapshot first
 		snap := &apis.ZFSSnapshot{}
 		snap.Name = vol.Name // use volname as snapname
@@ -601,7 +601,7 @@ func DestroyVolume(vol *apis.ZFSVolume) error {
 		return err
 	}
 
-	if srcVol, ok := vol.Labels[ZFSVolKey]; ok {
+	if srcVol, ok := vol.Labels[ZFSSrcVolKey]; ok {
 		// datasource is volume, delete the dependent snapshot
 		snap := &apis.ZFSSnapshot{}
 		snap.Name = vol.Name // snapname is same as volname