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

Control number of replies on wait in getBatchReplies

This commit is contained in:
Meng Xu 2020-05-01 10:09:08 -07:00
parent 2c17fff6bb
commit 05ba743f96
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/RestoreCommon.actor.h
View File

@ -296,9 +296,9 @@ Future<Void> getBatchReplies(RequestStream<Request> Interface::*channel, std::ma
if (ongoingReplies.empty()) { if (ongoingReplies.empty()) {
break; break;
} else { } else {
wait(waitForAny(ongoingReplies)); // wait(waitForAny(ongoingReplies));
// wait(quorum(ongoingReplies, std::min((int)SERVER_KNOBS->FASTRESTORE_REQBATCH_PARALLEL, wait(quorum(ongoingReplies, std::min((int)SERVER_KNOBS->FASTRESTORE_REQBATCH_PARALLEL,
// (int)ongoingReplies.size()))); (int)ongoingReplies.size())));
} }
// At least one reply is received; Calculate the reply duration // At least one reply is received; Calculate the reply duration
for (int j = 0; j < ongoingReplies.size(); ++j) { for (int j = 0; j < ongoingReplies.size(); ++j) {

4
fdbserver/RestoreLoader.actor.cpp
View File

@ -562,8 +562,6 @@ ACTOR Future<Void> sendMutationsToApplier(VersionedMutationsMap* pkvOps, int bat
.detail("Requests", requests.size()); .detail("Requests", requests.size());
fSends.push_back(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces, fSends.push_back(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces,
requests, TaskPriority::RestoreLoaderSendMutations)); requests, TaskPriority::RestoreLoaderSendMutations));
// wait(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces, requests,
// TaskPriority::RestoreLoaderSendMutations));
msgIndex++; msgIndex++;
msgSize = 0; msgSize = 0;
for (auto& applierID : applierIDs) { for (auto& applierID : applierIDs) {
@ -588,8 +586,6 @@ ACTOR Future<Void> sendMutationsToApplier(VersionedMutationsMap* pkvOps, int bat
.detail("Requests", requests.size()); .detail("Requests", requests.size());
fSends.push_back(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces, requests, fSends.push_back(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces, requests,
TaskPriority::RestoreLoaderSendMutations)); TaskPriority::RestoreLoaderSendMutations));
// wait(sendBatchRequests(&RestoreApplierInterface::sendMutationVector, *pApplierInterfaces, requests,
// TaskPriority::RestoreLoaderSendMutations));
} }
wait(waitForAll(fSends)); wait(waitForAll(fSends));