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

FastRestore:Revise sanity check condition

This commit is contained in:
Meng Xu 2020-01-22 13:27:25 -08:00
parent 52e3d20d39
commit c4a11597cf
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdbserver/RestoreMaster.actor.cpp
View File

@ -419,16 +419,15 @@ ACTOR static Future<Void> sendMutationsFromLoaders(Reference<MasterBatchData> ba
for (auto& reply : replies) { for (auto& reply : replies) {
RestoreSendStatus status = batchStatus->loadStatus[reply.id]; RestoreSendStatus status = batchStatus->loadStatus[reply.id];
if ((status == RestoreSendStatus::SendingRanges || status == RestoreSendStatus::SendingLogs) && if ((status == RestoreSendStatus::SendingRanges || status == RestoreSendStatus::SendingLogs)) {
!reply.isDuplicated) {
batchStatus->loadStatus[reply.id] = (status == RestoreSendStatus::SendingRanges) batchStatus->loadStatus[reply.id] = (status == RestoreSendStatus::SendingRanges)
? RestoreSendStatus::SendedRanges ? RestoreSendStatus::SendedRanges
: RestoreSendStatus::SendedLogs; : RestoreSendStatus::SendedLogs;
} else if ((status == RestoreSendStatus::SendingRanges || status == RestoreSendStatus::SendingLogs) && if (reply.isDuplicated) {
reply.isDuplicated) { TraceEvent(SevWarn, "FastRestoreSendMutations")
TraceEvent(SevWarn, "FastRestoreSendMutations")
.detail("Loader", reply.id) .detail("Loader", reply.id)
.detail("RequestUnprocessed", "Waiting for ack that loader has processed the request"); .detail("DuplicateRequestAcked", "Request should have been processed");
}
} else if ((status == RestoreSendStatus::SendedRanges || status == RestoreSendStatus::SendedLogs) && } else if ((status == RestoreSendStatus::SendedRanges || status == RestoreSendStatus::SendedLogs) &&
reply.isDuplicated) { reply.isDuplicated) {
TraceEvent(SevDebug, "FastRestoreSendMutations") TraceEvent(SevDebug, "FastRestoreSendMutations")