fix: destroy dependent clones synchronously (#605)

Author: agneum

engine/internal/cloning/base.go

@@ -7,6 +7,7 @@ package cloning
 import (
 	"context"
 	"database/sql"
+	stderrors "errors"
 	"fmt"
 	"sort"
 	"strconv"
@@ -308,6 +309,22 @@ func (c *Base) DestroyClone(cloneID string) error {
 		return models.New(models.ErrCodeNotFound, "clone not found")
 	}
 
+	if err := c.destroyPreChecks(cloneID, w); err != nil {
+		if stderrors.Is(err, errNoSession) {
+			return nil
+		}
+
+		return err
+	}
+
+	go c.destroyClone(cloneID, w)
+
+	return nil
+}
+
+var errNoSession = errors.New("no clone session")
+
+func (c *Base) destroyPreChecks(cloneID string, w *CloneWrapper) error {
 	if w.Clone.Protected && w.Clone.Status.Code != models.StatusFatal {
 		return models.New(models.ErrCodeBadRequest, "clone is protected")
 	}
@@ -330,46 +347,65 @@ func (c *Base) DestroyClone(cloneID string) error {
 			c.decrementCloneNumber(w.Clone.Snapshot.ID)
 		}
 
-		return nil
+		return errNoSession
 	}
 
-	go func() {
-		if err := c.provision.StopSession(w.Session, w.Clone); err != nil {
-			log.Errf("Failed to delete a clone: %v.", err)
+	return nil
+}
 
-			if updateErr := c.UpdateCloneStatus(cloneID, models.Status{
-				Code:    models.StatusFatal,
-				Message: errors.Cause(err).Error(),
-			}); updateErr != nil {
-				log.Errf("Failed to update clone status: %v", updateErr)
-			}
+func (c *Base) DestroyCloneSync(cloneID string) error {
+	w, ok := c.findWrapper(cloneID)
+	if !ok {
+		return models.New(models.ErrCodeNotFound, "clone not found")
+	}
 
-			return
+	if err := c.destroyPreChecks(cloneID, w); err != nil {
+		if stderrors.Is(err, errNoSession) {
+			return nil
 		}
 
-		c.deleteClone(cloneID)
+		return err
+	}
 
-		if w.Clone.Snapshot != nil {
-			c.decrementCloneNumber(w.Clone.Snapshot.ID)
-		}
-		c.observingCh <- cloneID
+	c.destroyClone(cloneID, w)
 
-		c.SaveClonesState()
+	return nil
+}
 
-		c.webhookCh <- webhooks.CloneEvent{
-			BasicEvent: webhooks.BasicEvent{
-				EventType: webhooks.CloneDeleteEvent,
-				EntityID:  cloneID,
-			},
-			Host:          c.config.AccessHost,
-			Port:          w.Session.Port,
-			Username:      w.Clone.DB.Username,
-			DBName:        w.Clone.DB.DBName,
-			ContainerName: cloneID,
+func (c *Base) destroyClone(cloneID string, w *CloneWrapper) {
+	if err := c.provision.StopSession(w.Session, w.Clone); err != nil {
+		log.Errf("Failed to delete a clone: %v.", err)
+
+		if updateErr := c.UpdateCloneStatus(cloneID, models.Status{
+			Code:    models.StatusFatal,
+			Message: errors.Cause(err).Error(),
+		}); updateErr != nil {
+			log.Errf("Failed to update clone status: %v", updateErr)
 		}
-	}()
 
-	return nil
+		return
+	}
+
+	c.deleteClone(cloneID)
+
+	if w.Clone.Snapshot != nil {
+		c.decrementCloneNumber(w.Clone.Snapshot.ID)
+	}
+	c.observingCh <- cloneID
+
+	c.SaveClonesState()
+
+	c.webhookCh <- webhooks.CloneEvent{
+		BasicEvent: webhooks.BasicEvent{
+			EventType: webhooks.CloneDeleteEvent,
+			EntityID:  cloneID,
+		},
+		Host:          c.config.AccessHost,
+		Port:          w.Session.Port,
+		Username:      w.Clone.DB.Username,
+		DBName:        w.Clone.DB.DBName,
+		ContainerName: cloneID,
+	}
 }
 
 // GetClone returns clone by ID.

engine/internal/provision/mode_local.go

@@ -230,9 +230,15 @@ func (p *Provisioner) StopSession(session *resources.Session, clone *models.Clon
 	}
 
 	if clone.Revision == branching.DefaultRevision {
+		// Destroy clone revision
 		if err := fsm.DestroyClone(clone.Branch, name, clone.Revision); err != nil {
 			return errors.Wrap(err, "failed to destroy clone")
 		}
+
+		// Destroy clone dataset
+		if err := fsm.DestroyDataset(fsm.Pool().CloneDataset(clone.Branch, name)); err != nil {
+			return errors.Wrap(err, "failed to destroy clone dataset")
+		}
 	}
 
 	if err := p.FreePort(session.Port); err != nil {

engine/internal/provision/resources/pool.go

@@ -94,6 +94,12 @@ func (p *Pool) BranchName(poolName, branchName string) string {
 	return branching.BranchName(poolName, branchName)
 }
 
+// CloneDataset returns a full clone dataset in the data pool.
+func (p *Pool) CloneDataset(branchName, cloneName string) string {
+	return branching.CloneDataset(p.Name, branchName, cloneName)
+}
+
+// CloneName returns a full clone name in the data pool.
 func (p *Pool) CloneName(branchName, cloneName string, revision int) string {
 	return branching.CloneName(p.Name, branchName, cloneName, revision)
 }

engine/internal/srv/routes.go

@@ -282,7 +282,7 @@ func (s *Server) deleteSnapshot(w http.ResponseWriter, r *http.Request) {
 
 	// Remove dependent clones.
 	for _, cloneID := range cloneIDs {
-		if err = s.Cloning.DestroyClone(cloneID); err != nil {
+		if err = s.Cloning.DestroyCloneSync(cloneID); err != nil {
 			api.SendBadRequestError(w, r, err.Error())
 			return
 		}
@@ -308,12 +308,31 @@ func (s *Server) deleteSnapshot(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if snapshotProperties.Clones == "" && snapshot.NumClones == 0 {
+		// Destroy dataset if there are no related objects
 		if fullDataset, _, found := strings.Cut(destroyRequest.SnapshotID, "@"); found {
 			if err = fsm.DestroyDataset(fullDataset); err != nil {
 				api.SendBadRequestError(w, r, err.Error())
 				return
 			}
 
+			// Remove dle:branch and dle:root from parent snapshot
+			if snapshotProperties.Parent != "" {
+				branchName := snapshotProperties.Branch
+				if branchName == "" {
+					branchName, _ = branching.ParseBranchName(fullDataset, poolName)
+				}
+
+				if branchName != "" {
+					if err := fsm.DeleteBranchProp(branchName, snapshotProperties.Parent); err != nil {
+						log.Err(err.Error())
+					}
+
+					if err := fsm.DeleteRootProp(branchName, snapshotProperties.Parent); err != nil {
+						log.Err(err.Error())
+					}
+				}
+			}
+
 			// TODO: review all available revisions. Destroy base dataset only if there no any revision.
 			if baseDataset, found := strings.CutSuffix(fullDataset, "/r0"); found {
 				if err = fsm.DestroyDataset(baseDataset); err != nil {

engine/pkg/util/branching/branching.go

@@ -27,6 +27,11 @@ func BranchName(poolName, branchName string) string {
 	return path.Join(poolName, BranchDir, branchName)
 }
 
+// CloneDataset returns a full clone dataset in the data pool.
+func CloneDataset(poolName, branchName, cloneName string) string {
+	return path.Join(BranchName(poolName, branchName), cloneName)
+}
+
 // CloneName returns a full clone name in the data pool.
 func CloneName(poolName, branchName, cloneName string, revision int) string {
 	return path.Join(BranchName(poolName, branchName), cloneName, RevisionSegment(revision))