Skip to content

Commit

Permalink
fix(zfspv): mounting the volume if it is ready
Browse files Browse the repository at this point in the history
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 openebs#175.

Signed-off-by: Pawan <pawan@mayadata.io>
  • Loading branch information
pawanpraka1 committed Jul 21, 2020
1 parent f4ccefa commit 22160e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pkg/zfs/mount.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 0 additions & 6 deletions pkg/zfs/zfs_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 22160e1

Please sign in to comment.