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

Resolve minor review comment

This commit is contained in:
Meng Xu 2020-03-28 16:03:01 -07:00
parent 6e60c62d7b
commit 13f343ec96
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdbserver/RestoreApplier.actor.cpp
View File

@ -222,8 +222,7 @@ ACTOR static Future<Void> getAndComputeStagingKeys(
retries++;
TraceEvent(retries > 10 ? SevError : SevWarn, "FastRestoreApplierGetAndComputeStagingKeysUnhandledError")
.detail("GetKeys", incompleteStagingKeys.size())
.detail("Error", e.what())
.detail("ErrorCode", e.code());
.error(e);
wait(tr->onError(e));
fValues.clear();
}

15
fdbserver/RestoreMaster.actor.cpp
View File

@ -84,10 +84,7 @@ ACTOR Future<Void> startRestoreMaster(Reference<RestoreWorkerData> masterWorker,
wait(startProcessRestoreRequests(self, cx));
} catch (Error& e) {
if (e.code() != error_code_operation_cancelled) {
TraceEvent(SevError, "FastRestoreMasterStart")
.detail("Reason", "Unexpected unhandled error")
.detail("ErrorCode", e.code())
.detail("Error", e.what());
TraceEvent(SevError, "FastRestoreMasterStart").detail("Reason", "Unexpected unhandled error").error(e);
}
}
@ -204,15 +201,13 @@ ACTOR Future<Void> startProcessRestoreRequests(Reference<RestoreMasterData> self
} catch (Error& e) {
if (restoreIndex < restoreRequests.size()) {
TraceEvent(SevError, "FastRestoreMasterProcessRestoreRequestsFailed", self->id())
.detail("Error", e.what())
.detail("ErrorCode", e.code())
.detail("RestoreRequest", restoreRequests[restoreIndex].toString());
.detail("RestoreRequest", restoreRequests[restoreIndex].toString())
.error(e);
} else {
TraceEvent(SevError, "FastRestoreMasterProcessRestoreRequestsFailed", self->id())
.detail("Error", e.what())
.detail("ErrorCode", e.code())
.detail("RestoreRequests", restoreRequests.size())
.detail("RestoreIndex", restoreIndex);
.detail("RestoreIndex", restoreIndex)
.error(e);
}
}