Fix merge error
This commit is contained in:
parent
aed97a9f20
commit
a8e3ad3c15
|
@ -3346,7 +3346,7 @@ ACTOR Future<Version> extractReadVersion(DatabaseContext* cx, TransactionPriorit
|
||||||
double latency = now() - startTime;
|
double latency = now() - startTime;
|
||||||
cx->GRVLatencies.addSample(latency);
|
cx->GRVLatencies.addSample(latency);
|
||||||
if (trLogInfo)
|
if (trLogInfo)
|
||||||
trLogInfo->addLog(FdbClientLogEvents::EventGetVersion_V2(startTime, latency, priority, rep.version));
|
trLogInfo->addLog(FdbClientLogEvents::EventGetVersion_V3(startTime, latency, priority, rep.version));
|
||||||
if (rep.version == 1 && rep.locked) {
|
if (rep.version == 1 && rep.locked) {
|
||||||
throw proxy_memory_limit_exceeded();
|
throw proxy_memory_limit_exceeded();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue