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

Signed-off-by: Pawan <pawan@mayadata.io>

deploy/yamls/zfssnapshot-crd.yaml

@@ -200,6 +200,14 @@ spec:
               successfully
             properties:
               state:
+                description: State specifies the current state of the snapshot provisioning
+                  request. The state "Pending" means that the snapshot creation request
+                  has not processed yet. The state "Ready" means that the snapshot
+                  has been created and it is ready for the use.
+                enum:
+                - Pending
+                - Ready
+                - Failed
                 type: string
             type: object
         required:

deploy/yamls/zfsvolume-crd.yaml

@@ -234,6 +234,7 @@ spec:
                 enum:
                 - Pending
                 - Ready
+                - Failed
                 type: string
             type: object
         required:

deploy/zfs-operator.yaml

@@ -255,6 +255,7 @@ spec:
                 enum:
                 - Pending
                 - Ready
+                - Failed
                 type: string
             type: object
         required:
@@ -645,6 +646,14 @@ spec:
               successfully
             properties:
               state:
+                description: State specifies the current state of the snapshot provisioning
+                  request. The state "Pending" means that the snapshot creation request
+                  has not processed yet. The state "Ready" means that the snapshot
+                  has been created and it is ready for the use.
+                enum:
+                - Pending
+                - Ready
+                - Failed
                 type: string
             type: object
         required:

pkg/apis/openebs.io/zfs/v1/zfssnapshot.go

@@ -48,5 +48,10 @@ type ZFSSnapshotList struct {
 
 // SnapStatus string that reflects if the snapshot was cretaed successfully
 type SnapStatus struct {
+	// State specifies the current state of the snapshot provisioning request.
+	// The state "Pending" means that the snapshot creation request has not
+	// processed yet. The state "Ready" means that the snapshot has been created
+	// and it is ready for the use.
+	// +kubebuilder:validation:Enum=Pending;Ready;Failed
 	State string `json:"state,omitempty"`
 }

pkg/apis/openebs.io/zfs/v1/zfsvolume.go

@@ -186,6 +186,6 @@ type VolStatus struct {
 	// The state "Pending" means that the volume creation request has not
 	// processed yet. The state "Ready" means that the volume has been created
 	// and it is ready for the use.
-	// +kubebuilder:validation:Enum=Pending;Ready
+	// +kubebuilder:validation:Enum=Pending;Ready;Failed
 	State string `json:"state,omitempty"`
 }

pkg/driver/controller.go

@@ -101,55 +101,6 @@ func getRoundedCapacity(size int64) int64 {
 	return ((size + Mi - 1) / Mi) * Mi
 }
 
-func waitForReadyVolume(volname string) error {
-	for true {
-		vol, err := zfs.GetZFSVolume(volname)
-		if err != nil {
-			return status.Errorf(codes.Internal,
-				"zfs: wait failed, not able to get the volume %s %s", volname, err.Error())
-		}
-
-		switch vol.Status.State {
-		case zfs.ZFSStatusReady:
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-	return nil
-}
-
-func waitForVolDestroy(volname string) error {
-	for true {
-		_, err := zfs.GetZFSVolume(volname)
-		if err != nil {
-			if k8serror.IsNotFound(err) {
-				return nil
-			}
-			return status.Errorf(codes.Internal,
-				"zfs: destroy wait failed, not able to get the volume %s %s", volname, err.Error())
-		}
-		time.Sleep(time.Second)
-	}
-	return nil
-}
-
-func waitForReadySnapshot(snapname string) error {
-	for true {
-		snap, err := zfs.GetZFSSnapshot(snapname)
-		if err != nil {
-			return status.Errorf(codes.Internal,
-				"zfs: wait failed, not able to get the snapshot %s %s", snapname, err.Error())
-		}
-
-		switch snap.Status.State {
-		case zfs.ZFSStatusReady:
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-	return nil
-}
-
 // CreateZFSVolume create new zfs volume from csi volume request
 func CreateZFSVolume(req *csi.CreateVolumeRequest) (string, error) {
 	volName := strings.ToLower(req.GetName())
@@ -180,19 +131,11 @@ func CreateZFSVolume(req *csi.CreateVolumeRequest) (string, error) {
 	capacity := strconv.FormatInt(int64(size), 10)
 
 	if vol, err := zfs.GetZFSVolume(volName); err == nil {
-		if vol.DeletionTimestamp != nil {
-			if _, ok := parameters["wait"]; ok {
-				if err := waitForVolDestroy(volName); err != nil {
-					return "", err
-				}
-			}
-		} else {
-			if vol.Spec.Capacity != capacity {
-				return "", status.Errorf(codes.AlreadyExists,
-					"volume %s already present", volName)
-			}
-			return vol.Spec.OwnerNodeID, nil
+		if vol.Spec.Capacity != capacity {
+			return "", status.Errorf(codes.AlreadyExists,
+				"volume %s already present", volName)
 		}
+		return vol.Spec.OwnerNodeID, nil
 	}
 
 	nmap, err := getNodeMap(schld, pool)
@@ -238,7 +181,7 @@ func CreateZFSVolume(req *csi.CreateVolumeRequest) (string, error) {
 	err = zfs.ProvisionVolume(volObj)
 	if err != nil {
 		return "", status.Errorf(codes.Internal,
-			"not able to provision the volume %s", err.Error())
+			"not able to provision the volume err : %s", err.Error())
 	}
 
 	return selected, nil
@@ -286,7 +229,7 @@ func CreateVolClone(req *csi.CreateVolumeRequest, srcVol string) (string, error)
 	err = zfs.ProvisionVolume(volObj)
 	if err != nil {
 		return "", status.Errorf(codes.Internal,
-			"clone: not able to provision the volume %s", err.Error())
+			"clone: not able to provision the volume err : %s", err.Error())
 	}
 
 	return selected, nil
@@ -339,7 +282,7 @@ func CreateSnapClone(req *csi.CreateVolumeRequest, snapshot string) (string, err
 	err = zfs.ProvisionVolume(volObj)
 	if err != nil {
 		return "", status.Errorf(codes.Internal,
-			"not able to provision the clone volume %s", err.Error())
+			"not able to provision the clone volume err : %s", err.Error())
 	}
 
 	return selected, nil
@@ -381,12 +324,6 @@ func (cs *controller) CreateVolume(
 		return nil, err
 	}
 
-	if _, ok := parameters["wait"]; ok {
-		if err := waitForReadyVolume(volName); err != nil {
-			return nil, err
-		}
-	}
-
 	sendEventOrIgnore(pvcName, volName, strconv.FormatInt(int64(size), 10), "zfs-localpv", analytics.VolumeProvision)
 
 	topology := map[string]string{zfs.ZFSTopologyKey: selected}
@@ -678,15 +615,6 @@ func (cs *controller) CreateSnapshot(
 		)
 	}
 
-	originalParams := req.GetParameters()
-	parameters := helpers.GetCaseInsensitiveMap(&originalParams)
-
-	if _, ok := parameters["wait"]; ok {
-		if err := waitForReadySnapshot(snapName); err != nil {
-			return nil, err
-		}
-	}
-
 	state, _ = zfs.GetZFSSnapshotStatus(snapName)
 
 	return csipayload.NewCreateSnapshotResponseBuilder().

pkg/mgmt/snapshot/snapshot.go

@@ -82,12 +82,14 @@ func (c *SnapController) syncSnap(snap *apis.ZFSSnapshot) error {
 			zfs.RemoveSnapFinalizer(snap)
 		}
 	} else {
-		// if finalizer is not set then it means we are creating
+		// status pendnig means we are creating
 		// the zfs snapshot.
-		if snap.Finalizers == nil {
+		if snap.Status.State == zfs.ZFSStatusPending {
 			err = zfs.CreateSnapshot(snap)
 			if err == nil {
-				err = zfs.UpdateSnapInfo(snap)
+				err = zfs.UpdateSnapInfo(snap, zfs.ZFSStatusReady)
+			} else {
+				err = zfs.UpdateSnapInfo(snap, zfs.ZFSStatusFailed)
 			}
 		}
 	}

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)
 			}
 		}
 	}