apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-18 12:10:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup mutation tags not counted in version vector

Browse Source
This commit is contained in:
Jingyu Zhou 2021-10-21 23:14:31 -07:00
parent 48a0ecd647
commit 9f305d67a9
1 changed files with 3 additions and 4 deletions

7
fdbserver/CommitProxyServer.actor.cpp

@ -1120,8 +1120,7 @@ ACTOR Future<Void> assignMutationsToStorageServers(CommitBatchContext* self) {
DEBUG_MUTATION("ProxyCommit", self->commitVersion, m) DEBUG_MUTATION("ProxyCommit", self->commitVersion, m)
.detail("Dbgid", pProxyCommitData->dbgid) .detail("Dbgid", pProxyCommitData->dbgid)
.detail("To", allSources) .detail("To", allSources);
.detail("Mutation", m);
self->toCommit.addTags(allSources); self->toCommit.addTags(allSources);
} }
@ -1221,8 +1220,6 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
// Second pass // Second pass
wait(assignMutationsToStorageServers(self)); wait(assignMutationsToStorageServers(self));
self->toCommit.saveTags(self->writtenTags);
// Serialize and backup the mutations as a single mutation // Serialize and backup the mutations as a single mutation
if ((pProxyCommitData->vecBackupKeys.size() > 1) && self->logRangeMutations.size()) { if ((pProxyCommitData->vecBackupKeys.size() > 1) && self->logRangeMutations.size()) {
wait(addBackupMutations(pProxyCommitData, wait(addBackupMutations(pProxyCommitData,
@ -1233,6 +1230,8 @@ ACTOR Future<Void> postResolution(CommitBatchContext* self) {
&self->computeStart)); &self->computeStart));
} }
self->toCommit.saveTags(self->writtenTags);
pProxyCommitData->stats.mutations += self->mutationCount; pProxyCommitData->stats.mutations += self->mutationCount;
pProxyCommitData->stats.mutationBytes += self->mutationBytes; pProxyCommitData->stats.mutationBytes += self->mutationBytes;