Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a395b27

Browse filesBrowse files
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 parents 86e8b82 + d8eb436 commit a395b27
Copy full SHA for a395b27

File tree

1 file changed

+12
-6
lines changed
Filter options

1 file changed

+12
-6
lines changed

‎internal/cloning/base.go

Copy file name to clipboardExpand all lines: internal/cloning/base.go
+12-6Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,23 +325,27 @@ func (c *Base) GetClone(id string) (*models.Clone, error) {
325325
return nil, errors.New("clone not found")
326326
}
327327

328-
if w.Session == nil {
328+
c.refreshCloneMetadata(w)
329+
330+
return w.Clone, nil
331+
}
332+
333+
func (c *Base) refreshCloneMetadata(w *CloneWrapper) {
334+
if w == nil || w.Session == nil || w.Clone == nil {
329335
// Not started yet.
330-
return w.Clone, nil
336+
return
331337
}
332338

333339
sessionState, err := c.provision.GetSessionState(w.Session)
334340
if err != nil {
335341
// 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))
337343

338-
return w.Clone, nil
344+
return
339345
}
340346

341347
w.Clone.Metadata.CloneDiffSize = sessionState.CloneDiffSize
342348
w.Clone.Metadata.LogicalSize = sessionState.LogicalReferenced
343-
344-
return w.Clone, nil
345349
}
346350

347351
// UpdateClone updates clone.
@@ -496,6 +500,8 @@ func (c *Base) GetClones() []*models.Clone {
496500
cloneWrapper.Clone.Snapshot = snapshot
497501
}
498502

503+
c.refreshCloneMetadata(cloneWrapper)
504+
499505
clones = append(clones, cloneWrapper.Clone)
500506
}
501507
c.cloneMutex.RUnlock()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.