diff options
| author | Jennifer Peshansky <jennifer.peshansky@mongodb.com> | 2022-11-03 16:13:20 +0000 |
|---|---|---|
| committer | Jennifer Peshansky <jennifer.peshansky@mongodb.com> | 2022-11-03 16:13:20 +0000 |
| commit | e74d2910bbe76790ad131d53fee277829cd95982 (patch) | |
| tree | cabe148764529c9623652374fbc36323a550cd44 /src/mongo/db/prepare_conflict_tracker.cpp | |
| parent | 280145e9940729480bb8a35453d4056afac87641 (diff) | |
| parent | ba467f46cc1bc49965e1d72b541eff0cf1d7b22e (diff) | |
| download | mongo-jenniferpeshansky/SERVER-70854.tar.gz | |
Merge branch 'master' into jenniferpeshansky/SERVER-70854jenniferpeshansky/SERVER-70854
Diffstat (limited to 'src/mongo/db/prepare_conflict_tracker.cpp')
| -rw-r--r-- | src/mongo/db/prepare_conflict_tracker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/prepare_conflict_tracker.cpp b/src/mongo/db/prepare_conflict_tracker.cpp index e8e031a1405..ac9c1b495fc 100644 --- a/src/mongo/db/prepare_conflict_tracker.cpp +++ b/src/mongo/db/prepare_conflict_tracker.cpp @@ -52,7 +52,7 @@ void PrepareConflictTracker::endPrepareConflict(OperationContext* opCtx) { auto curTick = tickSource->getTicks(); auto curConflictDuration = - tickSource->spanTo<Microseconds>(_prepareConflictStartTime, curTick); + tickSource->ticksTo<Microseconds>(curTick - _prepareConflictStartTime); _prepareConflictDuration.store(_prepareConflictDuration.load() + curConflictDuration); _prepareConflictStartTime = 0; |