Fix assertion failure of triggered version

The triggered version could be the same as popVersion.

20250321-025429-jzhou-a088c3f119331b93

100k tests/slow/ParallelRestoreNewBackupCorrectnessAtomicOp.toml
20250321-025532-jzhou-77e2dbd5fd035157
This commit is contained in:
Jingyu Zhou 2025-03-12 21:54:18 -07:00
parent 421306ec65
commit 169aa1c871
1 changed files with 2 additions and 2 deletions

View File

@ -480,7 +480,7 @@ struct BackupData {
// Save the noop pop version, which sets min version for
// the next backup job. Note this version may change after the wait.
state Version popVersion = self->popTrigger.get();
ASSERT(self->popVersion < popVersion);
ASSERT(self->popVersion <= popVersion);
wait(_saveNoopVersion(self, popVersion));
self->popVersion = popVersion;
TraceEvent("BackupWorkerNoopPop", self->myId)
@ -1157,7 +1157,7 @@ ACTOR Future<Void> monitorBackupKeyOrPullData(BackupData* self, bool keyPresent)
std::max(committedVersion.get(), self->minKnownCommittedVersion);
if (newPopVersion < self->popTrigger.get()) {
// this can happen if a different GRV proxy replies
DisabledTraceEvent("BackupWorkerNoopPop", self->myId)
DisabledTraceEvent("BackupWorkerSkipTrigger", self->myId)
.detail("Version", newPopVersion)
.detail("OldPop", self->popTrigger.get());
} else {