feat(zfspv): wait for zfs volume to be created

openebs · Jan 4, 2021 · ecc6c8d · ecc6c8d
1 parent 2e5e61d
commit ecc6c8d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -101,7 +101,7 @@ func getRoundedCapacity(size int64) int64 {
 	return ((size + Mi - 1) / Mi) * Mi
 }
 
-func waitForReadyVolume(volname string) error {
+func checkVolCreation(volname string) error {
 	for true {
 		vol, err := zfs.GetZFSVolume(volname)
 		if err != nil {
@@ -112,6 +112,10 @@ func waitForReadyVolume(volname string) error {
 		switch vol.Status.State {
 		case zfs.ZFSStatusReady:
 			return nil
+		case zfs.ZFSStatusFailed:
+			// delete the volume
+			zfs.DeleteVolume(volname)
+			return status.Errorf(codes.Internal, "zfs: not able to get create the volume")
 		}
 		time.Sleep(time.Second)
 	}
@@ -381,10 +385,8 @@ func (cs *controller) CreateVolume(
 		return nil, err
 	}
 
-	if _, ok := parameters["wait"]; ok {
-		if err := waitForReadyVolume(volName); err != nil {
-			return nil, err
-		}
+	if err := checkVolCreation(volName); err != nil {
+		return nil, err
 	}
 
 	sendEventOrIgnore(pvcName, volName, strconv.FormatInt(int64(size), 10), "zfs-localpv", analytics.VolumeProvision)

diff --git a/pkg/mgmt/volume/volume.go b/pkg/mgmt/volume/volume.go
@@ -95,7 +95,9 @@ func (c *ZVController) syncZV(zv *apis.ZFSVolume) error {
 				err = zfs.CreateVolume(zv)
 			}
 			if err == nil {
-				err = zfs.UpdateZvolInfo(zv)
+				err = zfs.UpdateZvolInfo(zv, zfs.ZFSStatusReady)
+			} else {
+				err = zfs.UpdateZvolInfo(zv, zfs.ZFSStatusFailed)
 			}
 		}
 	}

diff --git a/pkg/zfs/volume.go b/pkg/zfs/volume.go
@@ -179,7 +179,7 @@ func GetZFSVolumeState(volID string) (string, string, error) {
 }
 
 // UpdateZvolInfo updates ZFSVolume CR with node id and finalizer
-func UpdateZvolInfo(vol *apis.ZFSVolume) error {
+func UpdateZvolInfo(vol *apis.ZFSVolume, status string) error {
 	finalizers := []string{ZFSFinalizer}
 	labels := map[string]string{ZFSNodeKey: NodeID}
 
@@ -189,7 +189,7 @@ func UpdateZvolInfo(vol *apis.ZFSVolume) error {
 
 	newVol, err := volbuilder.BuildFrom(vol).
 		WithFinalizer(finalizers).
-		WithVolumeStatus(ZFSStatusReady).
+		WithVolumeStatus(status).
 		WithLabels(labels).Build()
 
 	if err != nil {