fix(zfspv): mounting the volume if it is ready

Instead of checking for the finalizer, checking for the volume state to be ready is more intuitive before mounting it. Also removed duplicate if statement for btrfs which was added while resolveing the merge conflict in #175. Signed-off-by: Pawan <[email protected]>
openebs · Jul 22, 2020 · e00a6b9 · e00a6b9
1 parent b6b4f0b
commit e00a6b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/changelogs/unreleased/184-pawanpraka1 b/changelogs/unreleased/184-pawanpraka1
@@ -0,0 +1 @@
+mounting the volume if it is ready
diff --git a/pkg/zfs/mount.go b/pkg/zfs/mount.go
@@ -139,8 +139,8 @@ func verifyMountRequest(vol *apis.ZFSVolume, mountpath string) error {
 		vol.Spec.OwnerNodeID != NodeID {
 		return status.Error(codes.Internal, "verifyMount: volume is owned by different node")
 	}
-	if vol.Finalizers == nil {
-		return status.Error(codes.Internal, "verifyMount: volume is not ready, driver has not yet set the finalizer")
+	if vol.Status.State != ZFSStatusReady {
+		return status.Error(codes.Internal, "verifyMount: volume is not ready to be mounted")
 	}
 
 	devicePath, err := GetVolumeDevPath(vol)

diff --git a/pkg/zfs/zfs_util.go b/pkg/zfs/zfs_util.go
@@ -370,12 +370,6 @@ func CreateClone(vol *apis.ZFSVolume) error {
 	if vol.Spec.FsType == "btrfs" {
 		return btrfsGenerateUUID(volume)
 	}
-	if vol.Spec.FsType == "btrfs" {
-		return btrfsGenerateUUID(volume)
-	}
-	if vol.Spec.FsType == "btrfs" {
-		return btrfsGenerateUUID(volume)
-	}
 	return nil
 }