R-1251: sync the restore copy's folders before the marker names it (a cut left undo.json as .tmp on Tester 1); the interrupted-restore record says the put-back waits, not 'run it again'. Commit only.
gates / gates (push) Successful in 1m24s
gates / gates (push) Successful in 1m24s
This commit is contained in:
1 parent
bb2809dc68
commit
062f9b41d9
12 files changed
+141
-16
No files matched your search
@@ -602,11 +602,11 @@ func main() {
|
||||
logger.Printf("[ERROR] [backup] leftover second-drive copy check: %v", err)
|
||||
}
|
||||
// R-550: load the persisted restore record BEFORE any page can ask for it.
|
||||
var putBack []string
|
||||
var putBack, waiting []string
|
||||
if appStopRecovery != nil {
|
||||
putBack = appStopRecovery.PutBack
|
||||
putBack, waiting = appStopRecovery.PutBack, appStopRecovery.Waiting
|
||||
}
|
||||
interruptedRestore = loadRestoreRecordAtStartup(backupMgr, cfg.Paths.DataDir, logger, putBack)
|
||||
interruptedRestore = loadRestoreRecordAtStartup(backupMgr, cfg.Paths.DataDir, logger, putBack, waiting)
|
||||
// R-519: an app-data run the stop cut off is said on the backup pages until the next complete run.
|
||||
loadRunRecordAtStartup(backupMgr, cfg.Paths.DataDir, logger)
|
||||
// R-166: use the guard that already ran Recover at startup, not a second one over the same
|
||||
|
||||
Reference in new issue
Block a user