Commita395b27

committed

Merge branch '309-refresh-clone-metadata' into 'master'

fix: show actual clone metadata in the API instance status response (#309)See merge request postgres-ai/database-lab!400

2 parents86e8b82 +d8eb436 commita395b27Copy full SHA for a395b27

File tree

+12

-6

lines changed

+12

-6

lines changed

Lines changed: 12 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -325,23 +325,27 @@ func (c Base) GetClone(id string) (models.Clone, error) {`
`325`	`325`	`returnnil,errors.New("clone not found")`
`326`	`326`	`}`
`327`	`327`
`328`		`-ifw.Session==nil {`
	`328`	`+c.refreshCloneMetadata(w)`
	`329`	`+`
	`330`	`+returnw.Clone,nil`
	`331`	`+}`
	`332`	`+`
	`333`	`+func (cBase)refreshCloneMetadata(wCloneWrapper) {`
	`334`	`+ifw==nil\|\|w.Session==nil\|\|w.Clone==nil {`
`329`	`335`	`// Not started yet.`
`330`		`-returnw.Clone,nil`
	`336`	`+return`
`331`	`337`	`}`
`332`	`338`
`333`	`339`	`sessionState,err:=c.provision.GetSessionState(w.Session)`
`334`	`340`	`iferr!=nil {`
`335`	`341`	`// Session not ready yet.`
`336`		`-log.Err(errors.Wrap(err,"failed to get a session state"))`
	`342`	`+log.Err(fmt.Errorf("failed to get a session state: %w",err))`
`337`	`343`
`338`		`-returnw.Clone,nil`
	`344`	`+return`
`339`	`345`	`}`
`340`	`346`
`341`	`347`	`w.Clone.Metadata.CloneDiffSize=sessionState.CloneDiffSize`
`342`	`348`	`w.Clone.Metadata.LogicalSize=sessionState.LogicalReferenced`
`343`		`-`
`344`		`-returnw.Clone,nil`
`345`	`349`	`}`
`346`	`350`
`347`	`351`	`// UpdateClone updates clone.`
`@@ -496,6 +500,8 @@ func (c Base) GetClones() []models.Clone {`
`496`	`500`	`cloneWrapper.Clone.Snapshot=snapshot`
`497`	`501`	`}`
`498`	`502`
	`503`	`+c.refreshCloneMetadata(cloneWrapper)`
	`504`	`+`
`499`	`505`	`clones=append(clones,cloneWrapper.Clone)`
`500`	`506`	`}`
`501`	`507`	`c.cloneMutex.RUnlock()`

Comments

(0)