restore api to return failure if cstorrestore is in invalid state

Signed-off-by: mayank <mayank.patel@mayadata.io>
openebs-archive · May 5, 2020 · f1acfc1 · f1acfc1
1 parent f52d1c1
commit f1acfc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/cstor-pool-mgmt/controller/restore/handler.go b/cmd/cstor-pool-mgmt/controller/restore/handler.go
@@ -44,6 +44,10 @@ func (c *RestoreController) syncHandler(key string, operation common.QueueOperat
 		return fmt.Errorf("can not retrieve CStorRestore %q", key)
 	}
 
+	if IsDoneStatus(rst) || IsFailedStatus(rst) {
+		return nil
+	}
+
 	status, err := c.rstEventHandler(operation, rst)
 	if status == "" {
 		return nil

diff --git a/cmd/maya-apiserver/app/server/restore_endpoint_v1alpha1.go b/cmd/maya-apiserver/app/server/restore_endpoint_v1alpha1.go
@@ -230,7 +230,7 @@ func getRestoreStatus(rst *v1alpha1.CStorRestore) (v1alpha1.CStorRestoreStatus,
 		switch rstStatus {
 		case v1alpha1.RSTCStorStatusInProgress:
 			rstStatus = v1alpha1.RSTCStorStatusInProgress
-		case v1alpha1.RSTCStorStatusFailed:
+		case v1alpha1.RSTCStorStatusFailed, v1alpha1.RSTCStorStatusInvalid:
 			if nr.Status != rstStatus {
 				// Restore for given CVR may failed due to node failure or pool failure
 				// Let's update status for given CVR's restore to failed