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

FR:Report error if controller throws error

This commit is contained in:
Meng Xu 2020-08-04 23:08:41 -07:00
parent 879998d01b
commit 309f383be3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/RestoreController.actor.cpp
View File

@ -105,7 +105,7 @@ ACTOR Future<Void> startRestoreController(Reference<RestoreWorkerData> controlle
ASSERT(controllerWorker->controllerInterf.present());
state Reference<RestoreControllerData> self =
Reference<RestoreControllerData>(new RestoreControllerData(controllerWorker->controllerInterf.get().id()));
state ActorCollectionNoErrors actors;
state ActorCollection actors(false);
try {
// recruitRestoreRoles must come after controllerWorker has finished collectWorkerInterface
@ -117,7 +117,7 @@ ACTOR Future<Void> startRestoreController(Reference<RestoreWorkerData> controlle
actors.add(traceProcessMetrics(self, "RestoreController"));
actors.add(sampleBackups(self, controllerWorker->controllerInterf.get()));
wait(startProcessRestoreRequests(self, cx));
wait(startProcessRestoreRequests(self, cx) || actors.getResult());
} catch (Error& e) {
if (e.code() != error_code_operation_cancelled) {
TraceEvent(SevError, "FastRestoreControllerStart").detail("Reason", "Unexpected unhandled error").error(e);