From dd8840837d0b4f6ee347071068f89b3a9a09e5ad Mon Sep 17 00:00:00 2001
From: Jingyu Zhou <jingyuzhou@gmail.com>
Date: Wed, 13 Oct 2021 16:06:17 -0700
Subject: [PATCH] Assert private mutation counts are the same from Resolvers

---
 fdbserver/ApplyMetadataMutation.cpp   | 4 ----
 fdbserver/CommitProxyServer.actor.cpp | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/fdbserver/ApplyMetadataMutation.cpp b/fdbserver/ApplyMetadataMutation.cpp
index a1540892e5..34fddb2736 100644
--- a/fdbserver/ApplyMetadataMutation.cpp
+++ b/fdbserver/ApplyMetadataMutation.cpp
@@ -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);
 		}
diff --git a/fdbserver/CommitProxyServer.actor.cpp b/fdbserver/CommitProxyServer.actor.cpp
index 3aad36691b..6d29158b31 100644
--- a/fdbserver/CommitProxyServer.actor.cpp
+++ b/fdbserver/CommitProxyServer.actor.cpp
@@ -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());
 		}