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

- Address a merge conflict

This commit is contained in:
Sreenath Bodagala 2021-07-15 20:01:58 +00:00
parent f275f4e6e8
commit 2f1b09c52c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/masterserver.actor.cpp
View File

@ -1251,7 +1251,7 @@ ACTOR Future<Void> serveLiveCommittedVersion(Reference<MasterData> self) {
// NB: this if-condition is not needed after wait-for-prev is ported to this branch
if (req.version > self->ssVersionVector.maxVersion) {
// TraceEvent("Received ReportRawCommittedVersionRequest").detail("Version",req.version);
self->ssVersionVector.setVersions(req.writtenTags.get(), req.version);
self->ssVersionVector.setVersion(req.writtenTags.get(), req.version);
}
}
if (req.version > self->liveCommittedVersion) {