mirror
/
mongo
mirror of https://github.com/mongodb/mongo
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SERVER-90356 Support PIT restore without entries after the checkpoint timestamp (#23957) 

GitOrigin-RevId: 29a95ae25abe9eb39af6546431089d258a318c65
This commit is contained in:
Frederic Vitzikam (fredvitz) 2024-07-24 13:40:07 -07:00 committed by MongoDB Bot
parent 8778799c2f
commit 900c17bbde
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jstests/libs/backup_utils.js
View File

@ -462,14 +462,17 @@ export class MagicRestoreUtils {
/** /**
* Retrieves all oplog entries that occurred after the checkpoint timestamp on the source node. * Retrieves all oplog entries that occurred after the checkpoint timestamp on the source node.
* Returns an object with the timestamp of the last oplog entry, as well as the oplog * Returns an object with the timestamp of the last oplog entry, as well as the oplog
* entry array * entry array. If there are no entries after the checkpoint timestamp, the returned timestamp
* is the checkpoint timestamp of the backup cursor.
*/ */
getEntriesAfterBackup(sourceNode) { getEntriesAfterBackup(sourceNode) {
let oplog = sourceNode.getDB("local").getCollection('oplog.rs'); let oplog = sourceNode.getDB("local").getCollection('oplog.rs');
const entriesAfterBackup = const entriesAfterBackup =
oplog.find({ts: {$gt: this.checkpointTimestamp}}).sort({ts: 1}).toArray(); oplog.find({ts: {$gt: this.checkpointTimestamp}}).sort({ts: 1}).toArray();
return { return {
lastOplogEntryTs: entriesAfterBackup[entriesAfterBackup.length - 1].ts, lastOplogEntryTs: (entriesAfterBackup.length != 0
? entriesAfterBackup[entriesAfterBackup.length - 1].ts
: this.checkpointTimestamp),
entriesAfterBackup entriesAfterBackup
}; };
} }
@ -541,7 +544,6 @@ export class MagicRestoreUtils {
writeObjsAndRunMagicRestore(restoreConfiguration, entriesAfterBackup, options) { writeObjsAndRunMagicRestore(restoreConfiguration, entriesAfterBackup, options) {
this.pointInTimeTimestamp = restoreConfiguration.pointInTimeTimestamp; this.pointInTimeTimestamp = restoreConfiguration.pointInTimeTimestamp;
if (this.pointInTimeTimestamp) { if (this.pointInTimeTimestamp) {
assert(entriesAfterBackup.length > 0);
this.isPit = true; this.isPit = true;
} }
MagicRestoreUtils.writeObjsToMagicRestorePipe( MagicRestoreUtils.writeObjsToMagicRestorePipe(