fix: allow resetting clone to a snapshot from a different pool (#275):

* choose a right pool on resetting clone to the snapshot from a different pool
* adjust clone counter for the snapshot after clone resetting

Author: agneum

pkg/services/cloning/base.go

@@ -415,10 +415,15 @@ func (c *Base) ResetClone(cloneID string, resetOptions types.ResetCloneRequest)
 	}
 
 	go func() {
-		// TODO(akartasov): adjust clone counter for the snapshot after clone resetting
+		var originalSnapshotID string
+
+		if w.Clone.Snapshot != nil {
+			originalSnapshotID = w.Clone.Snapshot.ID
+		}
+
 		snapshot, err := c.provision.ResetSession(w.Session, snapshotID)
 		if err != nil {
-			log.Errf("Failed to reset clone: %+v.", err)
+			log.Errf("Failed to reset clone: %v", err)
 
 			if updateErr := c.UpdateCloneStatus(cloneID, models.Status{
 				Code:    models.StatusFatal,
@@ -433,6 +438,8 @@ func (c *Base) ResetClone(cloneID string, resetOptions types.ResetCloneRequest)
 		c.cloneMutex.Lock()
 		w.Clone.Snapshot = snapshot
 		c.cloneMutex.Unlock()
+		c.decrementCloneNumber(originalSnapshotID)
+		c.incrementCloneNumber(snapshot.ID)
 
 		if err := c.UpdateCloneStatus(cloneID, models.Status{
 			Code:    models.StatusOK,

pkg/services/provision/mode_local.go

@@ -251,15 +251,24 @@ func (p *Provisioner) ResetSession(session *resources.Session, snapshotID string
 
 	log.Dbg("Snapshot ID to reset session: ", snapshot.ID)
 
+	newFSManager := fsm
+
+	if snapshot.Pool != session.Pool {
+		newFSManager, err = p.pm.GetFSManager(snapshot.Pool)
+		if err != nil {
+			return nil, errors.Wrap(err, "failed to find filesystem manager for a new session")
+		}
+
+		session.Pool = snapshot.Pool
+		session.SocketHost = newFSManager.Pool().SocketCloneDir(name)
+	}
+
 	defer func() {
 		if err != nil {
 			p.revertSession(name)
 		}
 	}()
 
-	appConfig := p.getAppConfig(fsm.Pool(), name, session.Port)
-	appConfig.SetExtraConf(session.ExtraConfig)
-
 	if err := postgres.Stop(p.runner, fsm.Pool(), name); err != nil {
 		return nil, errors.Wrap(err, "failed to stop container")
 	}
@@ -268,10 +277,13 @@ func (p *Provisioner) ResetSession(session *resources.Session, snapshotID string
 		return nil, errors.Wrap(err, "failed to destroy clone")
 	}
 
-	if err := fsm.CreateClone(name, snapshot.ID); err != nil {
+	if err := newFSManager.CreateClone(name, snapshot.ID); err != nil {
 		return nil, errors.Wrap(err, "failed to create clone")
 	}
 
+	appConfig := p.getAppConfig(newFSManager.Pool(), name, session.Port)
+	appConfig.SetExtraConf(session.ExtraConfig)
+
 	if err := postgres.Start(p.runner, appConfig); err != nil {
 		return nil, errors.Wrap(err, "failed to start container")
 	}
@@ -579,7 +591,7 @@ func (p *Provisioner) getAppConfig(pool *resources.Pool, name string, port uint)
 		Host:          pool.SocketCloneDir(name),
 		Port:          port,
 		DB:            p.dbCfg,
-		Pool:          pool, // TODO: check copying: it must be read-only struct.
+		Pool:          pool,
 		ContainerConf: p.config.ContainerConfig,
 		NetworkID:     p.networkID,
 	}