Commit 18cfa5a

committed

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

2 parents d3ca0bb + db12a1d commit 18cfa5aCopy full SHA for 18cfa5a

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ func (c *Base) Run(ctx context.Context) error {`
`78`	`78`	`return errors.Wrap(err, "failed to run cloning service")`
`79`	`79`	`}`
`80`	`80`
`81`		`- c.provision.DiscoverSnapshots()`
`82`		`-`
`83`	`81`	`if _, err := c.GetSnapshots(); err != nil {`
`84`	`82`	`log.Err("No available snapshots: ", err)`
`85`	`83`	`}`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,13 +298,6 @@ func (p Provisioner) ResetSession(session resources.Session, snapshotID string`
`298`	`298`	`return snapshotModel, nil`
`299`	`299`	`}`
`300`	`300`
`301`		`-// DiscoverSnapshots discovers snapshots from active pools.`
`302`		`-func (p *Provisioner) DiscoverSnapshots() {`
`303`		`- for _, fsManager := range p.pm.GetAvailableFSManagers() {`
`304`		`- fsManager.RefreshSnapshotList()`
`305`		`- }`
`306`		`-}`
`307`		`-`
`308`	`301`	`// GetSnapshots provides a snapshot list from active pools.`
`309`	`302`	`func (p *Provisioner) GetSnapshots() ([]resources.Snapshot, error) {`
`310`	`303`	`snapshots := []resources.Snapshot{}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -333,6 +333,8 @@ func (pm *Manager) examineEntries(entries []os.DirEntry) (map[string]FSManager,`
`333`	`333`	`continue`
`334`	`334`	`}`
`335`	`335`
	`336`	`+ fsm.RefreshSnapshotList()`
	`337`	`+`
`336`	`338`	`fsManagers[pool.Name] = fsm`
`337`	`339`
`338`	`340`	`front := poolList.Front()`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,9 @@ func buildSizeCommand(snapshot string) string {`
`658`	`658`	`func (m Manager) listDetails(filter snapshotFilter) ([]ListEntry, error) {`
`659`	`659`	`// TODO(anatoly): Return map.`
`660`	`660`	`// TODO(anatoly): Generalize.`
`661`		`- out, err := m.runner.Run(buildListCommand(filter), false)`
	`661`	`+ listCommand := buildListCommand(filter)`
	`662`	`+`
	`663`	`+ out, err := m.runner.Run(listCommand, false)`
`662`	`664`	`if err != nil {`
`663`	`665`	`return nil, errors.Wrap(err, "failed to list details")`
`664`	`666`	`}`
`@@ -718,7 +720,7 @@ func (m Manager) listDetails(filter snapshotFilter) ([]ListEntry, error) {`
`718`	`720`
`719`	`721`	`if err := rule.setFunc(rule.field); err != nil {`
`720`	`722`	`return nil, errors.Errorf("ZFS error: cannot parse output.\nCommand: %s.\nOutput: %s\nErr: %v",`
`721`		`- buildListCommand(filter), out, err)`
	`723`	`+ listCommand, out, err)`
`722`	`724`	`}`
`723`	`725`	`}`
`724`	`726`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,6 @@ func (s *Server) InitHandlers() {`
`176`	`176`	`r.HandleFunc("/clone/{id}", authMW.Authorized(s.patchClone)).Methods(http.MethodPatch)`
`177`	`177`	`r.HandleFunc("/clone/{id}", authMW.Authorized(s.getClone)).Methods(http.MethodGet)`
`178`	`178`	`r.HandleFunc("/clone/{id}/reset", authMW.Authorized(s.resetClone)).Methods(http.MethodPost)`
`179`		`- r.HandleFunc("/clone/{id}", authMW.Authorized(s.getClone)).Methods(http.MethodGet)`
`180`	`179`	`r.HandleFunc("/observation/start", authMW.Authorized(s.startObservation)).Methods(http.MethodPost)`
`181`	`180`	`r.HandleFunc("/observation/stop", authMW.Authorized(s.stopObservation)).Methods(http.MethodPost)`
`182`	`181`	`r.HandleFunc("/observation/summary/{clone_id}/{session_id}", authMW.Authorized(s.sessionSummaryObservation)).Methods(http.MethodGet)`

Comments

(0)