Log actor cancellation error to Client Transaction sampling records.
This commit is contained in:
parent
01a4888627
commit
1d95e1bfd6
|
@ -2485,6 +2485,9 @@ ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo>
|
||||||
state double startTime;
|
state double startTime;
|
||||||
if (info.debugID.present())
|
if (info.debugID.present())
|
||||||
TraceEvent(interval.begin()).detail( "Parent", info.debugID.get() );
|
TraceEvent(interval.begin()).detail( "Parent", info.debugID.get() );
|
||||||
|
|
||||||
|
state CommitTransactionRequest ctReq(*req);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Version v = wait( readVersion );
|
Version v = wait( readVersion );
|
||||||
req->transaction.read_snapshot = v;
|
req->transaction.read_snapshot = v;
|
||||||
|
@ -2563,8 +2566,8 @@ ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo>
|
||||||
} else {
|
} else {
|
||||||
if (e.code() != error_code_transaction_too_old && e.code() != error_code_not_committed && e.code() != error_code_database_locked)
|
if (e.code() != error_code_transaction_too_old && e.code() != error_code_not_committed && e.code() != error_code_database_locked)
|
||||||
TraceEvent(SevError, "tryCommitError").error(e);
|
TraceEvent(SevError, "tryCommitError").error(e);
|
||||||
if (e.code() != error_code_actor_cancelled && trLogInfo)
|
if (trLogInfo)
|
||||||
trLogInfo->addLog(FdbClientLogEvents::EventCommitError(startTime, static_cast<int>(e.code()), req));
|
trLogInfo->addLog(FdbClientLogEvents::EventCommitError(startTime, static_cast<int>(e.code()), &ctReq));
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue