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 self) { std::vector 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::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 initializeVersionBatch(Reference 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