Skip to content

Commit 2b503be

Browse files
committed
Merge branch '309-refresh-overlapping' into 'master'
fix: check the retrieval status before running a new data refresh iteration and skip refreshing if this is already in progress (#309) Closes #309 See merge request postgres-ai/database-lab!402
2 parents fa291e5 + 43fcfa1 commit 2b503be

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

internal/cloning/storage.go

-4
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ func (c *Base) filterRunningClones(ctx context.Context) {
112112

113113
// SaveClonesState writes clones state to disk.
114114
func (c *Base) SaveClonesState() {
115-
log.Msg("Saving state of running clones")
116-
117115
sessionsPath, err := util.GetMetaPath(sessionsFilename)
118116
if err != nil {
119117
log.Err("failed to get path of a sessions file", err)
@@ -122,8 +120,6 @@ func (c *Base) SaveClonesState() {
122120
if err := c.saveClonesState(sessionsPath); err != nil {
123121
log.Err("Failed to save the state of running clones", err)
124122
}
125-
126-
log.Msg("The state of running clones has been saved")
127123
}
128124

129125
// saveClonesState tries to write clones state to disk and returns an error on failure.

internal/retrieval/retrieval.go

+12
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,18 @@ func (r *Retrieval) refreshFunc(ctx context.Context) func() {
416416

417417
// fullRefresh performs full refresh for an unused storage pool and makes it active.
418418
func (r *Retrieval) fullRefresh(ctx context.Context) error {
419+
if r.State.Status == models.Refreshing {
420+
alert := telemetry.Alert{
421+
Level: models.RefreshSkipped,
422+
Message: "The data refresh is currently in progress. Skip a new data refresh iteration",
423+
}
424+
r.State.addAlert(alert)
425+
r.tm.SendEvent(ctx, telemetry.AlertEvent, alert)
426+
log.Msg(alert.Message)
427+
428+
return nil
429+
}
430+
419431
// Stop previous runs and snapshot schedulers.
420432
if r.ctxCancel != nil {
421433
r.ctxCancel()

0 commit comments

Comments
 (0)