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

Assert private mutation counts are the same from Resolvers

This commit is contained in:
Jingyu Zhou 2021-10-13 16:06:17 -07:00 committed by Dan Lambright
parent c6a9ac11a8
commit dd8840837d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/ApplyMetadataMutation.cpp
View File

@ -865,12 +865,8 @@ private:
if (Optional<Value> tagV = txnStateStore->readValue(serverTagKeyFor(ssId)).get(); tagV.present()) {
MutationRef privatized = m;
privatized.param1 = m.param1.withPrefix(systemKeys.begin, arena);
<<<<<<< HEAD
TraceEvent(SevDebug, "SendingPrivatized", dbgid).detail("M", privatized.toString());
=======
privatized.param2 = m.param2.withPrefix(systemKeys.begin, arena);
TraceEvent(SevDebug, "SendingPrivatized_ClearTSSMapping", dbgid).detail("M", privatized.toString());
>>>>>>> f6a9b291b... Address Dan's comments by changing trace event names
toCommit->addTag(decodeServerTagValue(tagV.get()));
toCommit->writeTypedMessage(privatized);
}

1
fdbserver/CommitProxyServer.actor.cpp
View File

@ -847,6 +847,7 @@ void assertResolutionStateMutationsSizeConsistent(const std::vector<ResolveTrans
for (int r = 1; r < resolution.size(); r++) {
ASSERT(resolution[r].stateMutations.size() == resolution[0].stateMutations.size());
ASSERT_EQ(resolution[0].privateMutationCount, resolution[r].privateMutationCount);
for (int s = 0; s < resolution[r].stateMutations.size(); s++) {
ASSERT(resolution[r].stateMutations[s].size() == resolution[0].stateMutations[s].size());
}