From 6b07c271f1aa53bb56275b14fa7207de82819b99 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Tue, 3 Dec 2019 16:55:23 -0800
Subject: [PATCH] Fix non-deterministic error

---
 fdbserver/RestoreLoader.actor.h   | 1 +
 fdbserver/RestoreMaster.actor.cpp | 4 ++++
 fdbserver/RestoreMaster.actor.h   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/fdbserver/RestoreLoader.actor.h b/fdbserver/RestoreLoader.actor.h
index b43f74ff28..cc89c8314f 100644
--- a/fdbserver/RestoreLoader.actor.h
+++ b/fdbserver/RestoreLoader.actor.h
@@ -84,6 +84,7 @@ struct RestoreLoaderData : RestoreRoleData, public ReferenceCounted<RestoreLoade
 		numSampledMutations = 0;
 		processedFileParams.clear();
 		kvOpsPerLP.clear();
+		sampleMutations.clear();
 	}
 
 	// Only get the appliers that are responsible for a range
diff --git a/fdbserver/RestoreMaster.actor.cpp b/fdbserver/RestoreMaster.actor.cpp
index 030cd7afe0..758d818fce 100644
--- a/fdbserver/RestoreMaster.actor.cpp
+++ b/fdbserver/RestoreMaster.actor.cpp
@@ -364,12 +364,14 @@ void splitKeyRangeForAppliers(Reference<RestoreMasterData> self) {
 	std::vector<Key> keyrangeSplitter;
 	keyrangeSplitter.push_back(normalKeys.begin); // First slot
 	double cumulativeSize = slotSize;
+	TraceEvent("FastRestore").detail("VersionBatch", self->batchIndex).detail("SamplingSize", self->samplesSize);
 	while (cumulativeSize < self->samplesSize) {
 		IndexedSet<Key, int64_t>::iterator lowerBound = self->samples.index(cumulativeSize);
 		if (lowerBound == self->samples.end()) {
 			break;
 		}
 		keyrangeSplitter.push_back(*lowerBound);
+		TraceEvent("FastRestore").detail("VersionBatch", self->batchIndex).detail("CumulativeSize", cumulativeSize).detail("SlotSize", slotSize);
 		cumulativeSize += slotSize;
 	}
 	if (keyrangeSplitter.size() < numAppliers) {
@@ -491,6 +493,8 @@ ACTOR static Future<Void> initializeVersionBatch(Reference<RestoreMasterData> se
 	}
 	wait(sendBatchRequests(&RestoreLoaderInterface::initVersionBatch, self->loadersInterf, requestsToLoaders));
 
+	self->resetPerVersionBatch();
+
 	return Void();
 }
 
diff --git a/fdbserver/RestoreMaster.actor.h b/fdbserver/RestoreMaster.actor.h
index 072094a2cf..b32f4909b8 100644
--- a/fdbserver/RestoreMaster.actor.h
+++ b/fdbserver/RestoreMaster.actor.h
@@ -77,6 +77,7 @@ struct RestoreMasterData : RestoreRoleData, public ReferenceCounted<RestoreMaste
 	~RestoreMasterData() = default;
 
 	void resetPerVersionBatch() {
+		TraceEvent("FastRestore").detail("RestoreMaster", "ResetPerVersionBatch").detail("VersionBatchIndex", batchIndex);
 		samplesSize = 0;
 		samples.clear();
 	}