Merge pull request #5461 from sfc-gh-satherton/durability-bug-repro1

TLogServer popped version calculation was off-by-one for retired tags after master recovery
This commit is contained in:
Steve Atherton 2021-08-25 15:56:49 -07:00 committed by GitHub
commit 5c29da2a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View File

@ -1159,7 +1159,7 @@ Version poppedVersion(Reference<LogData> self, Tag tag) {
if (tag == txsTag || tag.locality == tagLocalityTxs) {
return 0;
}
return self->recoveredAt;
return self->recoveredAt + 1;
}
return tagData->popped;
}

View File

@ -1378,7 +1378,7 @@ Version poppedVersion(Reference<LogData> self, Tag tag) {
if (tag == txsTag || tag.locality == tagLocalityTxs) {
return 0;
}
return self->recoveredAt;
return self->recoveredAt + 1;
}
return tagData->popped;
}

View File

@ -1507,7 +1507,7 @@ Version poppedVersion(Reference<LogData> self, Tag tag) {
if (tag == txsTag || tag.locality == tagLocalityTxs) {
return 0;
}
return self->recoveredAt;
return self->recoveredAt + 1;
}
return tagData->popped;
}