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

includeCancelled for tLogSnapCreate

This commit is contained in:
sramamoorthy 2019-07-04 10:20:29 -07:00 committed by Alex Miller
parent 080b3da322
commit a335ed2011
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fdbserver/OldTLogServer_6_0.actor.cpp
View File

@ -1821,8 +1821,12 @@ tLogSnapCreate(TLogSnapRequest snapReq, TLogData* self, Reference<LogData> logDa
snapReq.reply.send(Void());
} catch (Error& e) {
TraceEvent("TLogExecHelperError").error(e);
snapReq.reply.sendError(e);
TraceEvent("TLogExecHelperError").error(e, true /*includeCancelled */);
if (e.code() == error_code_operation_cancelled) {
snapReq.reply.sendError(broken_promise());
} else {
snapReq.reply.sendError(e);
}
}
return Void();
}

8
fdbserver/TLogServer.actor.cpp
View File

@ -2200,8 +2200,12 @@ tLogSnapCreate(TLogSnapRequest snapReq, TLogData* self, Reference<LogData> logDa
snapReq.reply.send(Void());
} catch (Error& e) {
TraceEvent("TLogExecHelperError").error(e);
snapReq.reply.sendError(e);
TraceEvent("TLogExecHelperError").error(e, true /*includeCancelled */);
if (e.code() == error_code_operation_cancelled) {
snapReq.reply.sendError(broken_promise());
} else {
snapReq.reply.sendError(e);
}
}
return Void();
}