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

Merge pull request #8461 from hfu94/id 

Each getRange request in a txn has a distinct trace id
This commit is contained in:
Jingyu Zhou 2022-11-07 09:34:22 -08:00 committed by GitHub
parent a121205d22 293cc2a8fb
commit 0adcd92d33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbclient/NativeAPI.actor.cpp
View File

@ -4356,6 +4356,7 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
state KeySelector originalEnd = end; state KeySelector originalEnd = end;
state RangeResultFamily output; state RangeResultFamily output;
state Span span("NAPI:getRange"_loc, trState->spanContext); state Span span("NAPI:getRange"_loc, trState->spanContext);
state Optional<UID> getRangeID = Optional<UID>();
if (useTenant && trState->tenant().present()) { if (useTenant && trState->tenant().present()) {
span.addAttribute("tenant"_sr, trState->tenant().get()); span.addAttribute("tenant"_sr, trState->tenant().get());
} }
@ -4440,11 +4441,14 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
req.tags = trState->cx->sampleReadTags() ? trState->options.readTags : Optional<TagSet>(); req.tags = trState->cx->sampleReadTags() ? trState->options.readTags : Optional<TagSet>();
req.spanContext = span.context; req.spanContext = span.context;
if (trState->readOptions.present() && trState->readOptions.get().debugID.present()) {
getRangeID = nondeterministicRandom()->randomUniqueID();
g_traceBatch.addAttach(
"TransactionAttachID", trState->readOptions.get().debugID.get().first(), getRangeID.get().first());
}
try { try {
if (trState->readOptions.present() && trState->readOptions.get().debugID.present()) { if (getRangeID.present()) {
g_traceBatch.addEvent("TransactionDebug", g_traceBatch.addEvent("TransactionDebug", getRangeID.get().first(), "NativeAPI.getRange.Before");
trState->readOptions.get().debugID.get().first(),
"NativeAPI.getRange.Before");
/*TraceEvent("TransactionDebugGetRangeInfo", trState->readOptions.debugID.get()) /*TraceEvent("TransactionDebugGetRangeInfo", trState->readOptions.debugID.get())
.detail("ReqBeginKey", req.begin.getKey()) .detail("ReqBeginKey", req.begin.getKey())
.detail("ReqEndKey", req.end.getKey()) .detail("ReqEndKey", req.end.getKey())
@ -4484,9 +4488,9 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
throw; throw;
} }
if (trState->readOptions.present() && trState->readOptions.get().debugID.present()) { if (getRangeID.present()) {
g_traceBatch.addEvent("TransactionDebug", g_traceBatch.addEvent("TransactionDebug",
trState->readOptions.get().debugID.get().first(), getRangeID.get().first(),
"NativeAPI.getRange.After"); //.detail("SizeOf", rep.data.size()); "NativeAPI.getRange.After"); //.detail("SizeOf", rep.data.size());
/*TraceEvent("TransactionDebugGetRangeDone", trState->readOptions.debugID.get()) /*TraceEvent("TransactionDebugGetRangeDone", trState->readOptions.debugID.get())
.detail("ReqBeginKey", req.begin.getKey()) .detail("ReqBeginKey", req.begin.getKey())
@ -4600,11 +4604,9 @@ Future<RangeResultFamily> getRange(Reference<TransactionState> trState,
} }
} catch (Error& e) { } catch (Error& e) {
if (trState->readOptions.present() && trState->readOptions.get().debugID.present()) { if (getRangeID.present()) {
g_traceBatch.addEvent("TransactionDebug", g_traceBatch.addEvent("TransactionDebug", getRangeID.get().first(), "NativeAPI.getRange.Error");
trState->readOptions.get().debugID.get().first(), TraceEvent("TransactionDebugError", getRangeID.get()).error(e);
"NativeAPI.getRange.Error");
TraceEvent("TransactionDebugError", trState->readOptions.get().debugID.get()).error(e);
} }
if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed || if (e.code() == error_code_wrong_shard_server || e.code() == error_code_all_alternatives_failed ||
(e.code() == error_code_transaction_too_old && readVersion == latestVersion)) { (e.code() == error_code_transaction_too_old && readVersion == latestVersion)) {