Merge branch '341-lost-snapshots' into 'master'

fix(engine): avoid losing the snapshot list on configuration reload (#341)

Closes #341

See merge request postgres-ai/database-lab!506

Author: agneum

engine/internal/cloning/base.go

@@ -78,8 +78,6 @@ func (c *Base) Run(ctx context.Context) error {
 		return errors.Wrap(err, "failed to run cloning service")
 	}
 
-	c.provision.DiscoverSnapshots()
-
 	if _, err := c.GetSnapshots(); err != nil {
 		log.Err("No available snapshots: ", err)
 	}

engine/internal/provision/mode_local.go

@@ -298,13 +298,6 @@ func (p *Provisioner) ResetSession(session *resources.Session, snapshotID string
 	return snapshotModel, nil
 }
 
-// DiscoverSnapshots discovers snapshots from active pools.
-func (p *Provisioner) DiscoverSnapshots() {
-	for _, fsManager := range p.pm.GetAvailableFSManagers() {
-		fsManager.RefreshSnapshotList()
-	}
-}
-
 // GetSnapshots provides a snapshot list from active pools.
 func (p *Provisioner) GetSnapshots() ([]resources.Snapshot, error) {
 	snapshots := []resources.Snapshot{}

engine/internal/provision/pool/pool_manager.go

@@ -333,6 +333,8 @@ func (pm *Manager) examineEntries(entries []os.DirEntry) (map[string]FSManager,
 			continue
 		}
 
+		fsm.RefreshSnapshotList()
+
 		fsManagers[pool.Name] = fsm
 
 		front := poolList.Front()

engine/internal/provision/thinclones/zfs/zfs.go

@@ -658,7 +658,9 @@ func buildSizeCommand(snapshot string) string {
 func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 	// TODO(anatoly): Return map.
 	// TODO(anatoly): Generalize.
-	out, err := m.runner.Run(buildListCommand(filter), false)
+	listCommand := buildListCommand(filter)
+
+	out, err := m.runner.Run(listCommand, false)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to list details")
 	}
@@ -718,7 +720,7 @@ func (m *Manager) listDetails(filter snapshotFilter) ([]*ListEntry, error) {
 
 			if err := rule.setFunc(rule.field); err != nil {
 				return nil, errors.Errorf("ZFS error: cannot parse output.\nCommand: %s.\nOutput: %s\nErr: %v",
-					buildListCommand(filter), out, err)
+					listCommand, out, err)
 			}
 		}
 

engine/internal/srv/server.go

@@ -176,7 +176,6 @@ func (s *Server) InitHandlers() {
 	r.HandleFunc("/clone/{id}", authMW.Authorized(s.patchClone)).Methods(http.MethodPatch)
 	r.HandleFunc("/clone/{id}", authMW.Authorized(s.getClone)).Methods(http.MethodGet)
 	r.HandleFunc("/clone/{id}/reset", authMW.Authorized(s.resetClone)).Methods(http.MethodPost)
-	r.HandleFunc("/clone/{id}", authMW.Authorized(s.getClone)).Methods(http.MethodGet)
 	r.HandleFunc("/observation/start", authMW.Authorized(s.startObservation)).Methods(http.MethodPost)
 	r.HandleFunc("/observation/stop", authMW.Authorized(s.stopObservation)).Methods(http.MethodPost)
 	r.HandleFunc("/observation/summary/{clone_id}/{session_id}", authMW.Authorized(s.sessionSummaryObservation)).Methods(http.MethodGet)