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

FastRestore:applyToDB:Cosmic change for review comments 

No functional change.
This commit is contained in:
Meng Xu 2019-10-14 12:52:13 -07:00
parent 71509a5157
commit 7b36fee38f
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fdbserver/RestoreApplier.actor.cpp
View File

@ -153,14 +153,13 @@ ACTOR Future<Void> applyToDB(Reference<RestoreApplierData> self, Database cx) {
self->sanityCheckMutationOps();
// When the current txn fails and retries, startItInUncommittedTxn is the starting iterator in retry;
// When the current txn fails and retries,
// startIndexInUncommittedTxn is the starting index in retry;
state std::map<Version, Standalone<VectorRef<MutationRef>>>::iterator curItInCurTxn = self->kvOps.begin();
state VersionedMutationsMap::iterator curItInCurTxn = self->kvOps.begin();
state int curIndexInCurTxn = 0; // current index in current txn; it increases per mutation
// In case a version has 0 txns
while (curItInCurTxn != self->kvOps.end() && curIndexInCurTxn >= curItInCurTxn->second.size()) {
curIndexInCurTxn = 0;
while (curItInCurTxn != self->kvOps.end() && curItInCurTxn->second.empty()) {
curItInCurTxn++;
}
if (curItInCurTxn == self->kvOps.end()) {
@ -202,7 +201,6 @@ ACTOR Future<Void> applyToDB(Reference<RestoreApplierData> self, Database cx) {
TraceEvent(SevWarn, "FastRestore_ApplyTxnError")
.detail("TxnStatusFailed", curTxnId)
.detail("ApplierApplyToDB", self->id())
.detail("CurrentFailedTxnId", curIndexInCurTxn)
.detail("UncommittedTxnId", uncommittedTxnId)
.detail("CurIteratorVersion", curItInCurTxn->first)
.detail("StartIteratorVersionInUncommittedTxn", startItInUncommittedTxn->first)
@ -224,7 +222,6 @@ ACTOR Future<Void> applyToDB(Reference<RestoreApplierData> self, Database cx) {
TraceEvent(SevWarn, "FastRestore_ApplyTxnError")
.detail("TxnStatusSucceeded", curTxnId)
.detail("ApplierApplyToDB", self->id())
.detail("CurrentSucceedTxnId", curIndexInCurTxn)
.detail("CurIteratorVersion", curItInCurTxn->first)
.detail("CurrentIteratorMutations", curItInCurTxn->second.size())
.detail("CurrentIndexInSucceedTxn", curIndexInCurTxn)
@ -318,12 +315,12 @@ ACTOR Future<Void> applyToDB(Reference<RestoreApplierData> self, Database cx) {
//}
} catch (Error& e) {
TraceEvent(SevWarnAlways, "FastRestore_ApplyTxnError")
.detail("Error", e.what())
.detail("TxnStatus", "?")
.detail("ApplierApplyToDB", self->id())
.detail("TxnId", curTxnId)
.detail("StartIndexInCurrentTxn", curIndexInCurTxn)
.detail("Version", curItInCurTxn->first);
.detail("Version", curItInCurTxn->first)
.error(e, true);
lastTxnHasError = true;
// if (e.code() == commit_unknown_result) {
// lastTxnHasError = true;