wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for minRestorableVersion and maxRestorableVersion not updating correctly in case of missing mutation logs. (#12710)

This commit is contained in:
neethuhaneesha 2026-02-16 11:17:32 -08:00 committed by GitHub
parent f37766397f
commit 684832aa44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fdbclient/BackupContainerFileSystem.actor.cpp
View File

@ -716,24 +716,26 @@ public:
desc.snapshotBytes += s.totalSize;
// If the snapshot is at a single version then it requires no logs. Update min and max restorable.
// TODO: Somehow check / report if the restorable range is not or may not be contiguous.
if (s.beginVersion == s.endVersion &&
(!desc.contiguousLogEnd.present() || // no logs
(desc.contiguousLogEnd.present() &&
desc.contiguousLogEnd.get() >= s.beginVersion)) // have logs, then should cover snapshot
) {
if (!desc.minRestorableVersion.present() || s.endVersion < desc.minRestorableVersion.get())
desc.minRestorableVersion = s.endVersion;
if (!desc.maxRestorableVersion.present() || s.endVersion > desc.maxRestorableVersion.get())
desc.maxRestorableVersion = s.endVersion;
// If the snapshot is at a single version and then it requires no logs. Update min and max restorable.
// Update only if minRestorableVersion and maxRestorableVersion are not set. If they are set, we should
// check for log continuity between current minRestorableVersion to s.endVersion which happens in the
// next if block.
if (s.beginVersion == s.endVersion && !desc.minRestorableVersion.present() &&
!desc.maxRestorableVersion.present()) {
desc.minRestorableVersion = s.endVersion;
desc.maxRestorableVersion = s.endVersion;
}
// If the snapshot is covered by the contiguous log chain then update min/max restorable.
if (desc.minLogBegin.present() && s.beginVersion >= desc.minLogBegin.get() &&
s.endVersion < desc.contiguousLogEnd.get()) {
if (!desc.minRestorableVersion.present() || s.endVersion < desc.minRestorableVersion.get())
// If minRestorableVersion not present, update minRestorableVersion to snapshot endVersion.
// If minRestorableVersion present and if it has continuous logs from minRestorableVersion
// to snapshot endVersion, don't update the minRestorableVersion.
// Else, means it has no continous logs, so update minRestorableVersion to s.endVersion.
if (!desc.minRestorableVersion.present() ||
!(desc.minRestorableVersion.get() >= desc.minLogBegin.get() &&
desc.minRestorableVersion.get() < desc.contiguousLogEnd.get()))
desc.minRestorableVersion = s.endVersion;
if (!desc.maxRestorableVersion.present() ||
@ -749,8 +751,6 @@ public:
(desc.contiguousLogEnd.get() == s.beginVersion && s.beginVersion != s.endVersion)) &&
s.restorable.get()) {
if (desc.minRestorableVersion.present() && desc.maxRestorableVersion.present()) {
ASSERT(desc.minRestorableVersion.get() < s.beginVersion);
// check if we have contiguous logs from minRestorableVersion to current snapshot endVersion
bool contiguousLogs = false;
if (desc.partitioned)

15
fdbserver/workloads/BackupAndParallelRestoreCorrectness.actor.cpp
View File

@ -561,16 +561,11 @@ struct BackupAndParallelRestoreCorrectnessWorkload : TestWorkload {
targetVersion = desc.minRestorableVersion.get();
} else if (deterministicRandom()->random01() < 0.1) {
targetVersion = desc.maxRestorableVersion.get();
} else if (deterministicRandom()->random01() < 0.5 &&
desc.minRestorableVersion.get() < desc.contiguousLogEnd.get()) {
// The assertion may fail because minRestorableVersion may be decided by snapshot version.
// ASSERT_WE_THINK(desc.minRestorableVersion.get() <= desc.contiguousLogEnd.get());
// This assertion can fail when contiguousLogEnd < maxRestorableVersion and
// the snapshot version > contiguousLogEnd. I.e., there is a gap between
// contiguousLogEnd and snapshot version.
// ASSERT_WE_THINK(desc.contiguousLogEnd.get() > desc.maxRestorableVersion.get());
targetVersion = deterministicRandom()->randomInt64(desc.minRestorableVersion.get(),
desc.contiguousLogEnd.get());
} else if (deterministicRandom()->random01() < 0.5) {
targetVersion = (desc.minRestorableVersion.get() != desc.maxRestorableVersion.get())
? deterministicRandom()->randomInt64(desc.minRestorableVersion.get(),
desc.maxRestorableVersion.get())
: desc.maxRestorableVersion.get();
}
}