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

Fix an internal error that occurred when using client buggify and a successful transaction was failed with commit_unknown_result. 

Move some buggify errors into a try catch block so that the normal error handling path can run.
Initialize startTime so that it's valid in the case of errors thrown early.
This commit is contained in:
A.J. Beamon 2019-12-09 09:44:48 -08:00
parent d94a1dfef2
commit 290cbb7628
1 changed files with 12 additions and 12 deletions

24
fdbclient/NativeAPI.actor.cpp
View File

@ -2602,19 +2602,19 @@ void Transaction::setupWatches() {
ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo> trLogInfo, CommitTransactionRequest req, Future<Version> readVersion, TransactionInfo info, Version* pCommittedVersion, Transaction* tr, TransactionOptions options) {
state TraceInterval interval( "TransactionCommit" );
state double startTime;
state double startTime = now();
if (info.debugID.present())
TraceEvent(interval.begin()).detail( "Parent", info.debugID.get() );
if(CLIENT_BUGGIFY) {
throw deterministicRandom()->randomChoice(std::vector<Error>{
not_committed(),
transaction_too_old(),
proxy_memory_limit_exceeded(),
commit_unknown_result()});
}
try {
if(CLIENT_BUGGIFY) {
throw deterministicRandom()->randomChoice(std::vector<Error>{
not_committed(),
transaction_too_old(),
proxy_memory_limit_exceeded(),
commit_unknown_result()});
}
Version v = wait( readVersion );
req.transaction.read_snapshot = v;
@ -2643,6 +2643,9 @@ ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo>
when (CommitID ci = wait( reply )) {
Version v = ci.version;
if (v != invalidVersion) {
if (CLIENT_BUGGIFY) {
throw commit_unknown_result();
}
if (info.debugID.present())
TraceEvent(interval.end()).detail("CommittedVersion", v);
*pCommittedVersion = v;
@ -2668,9 +2671,6 @@ ACTOR static Future<Void> tryCommit( Database cx, Reference<TransactionLogInfo>
cx->latencies.addSample(now() - tr->startTime);
if (trLogInfo)
trLogInfo->addLog(FdbClientLogEvents::EventCommit(startTime, latency, req.transaction.mutations.size(), req.transaction.mutations.expectedSize(), req));
if (CLIENT_BUGGIFY) {
throw commit_unknown_result();
}
return Void();
} else {
if (info.debugID.present())