diff options
Diffstat (limited to 'src/mongo/db/concurrency')
-rw-r--r-- | src/mongo/db/concurrency/flow_control_ticketholder.cpp | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/mongo/db/concurrency/flow_control_ticketholder.cpp b/src/mongo/db/concurrency/flow_control_ticketholder.cpp index 6bb95797502..b8f6217665c 100644 --- a/src/mongo/db/concurrency/flow_control_ticketholder.cpp +++ b/src/mongo/db/concurrency/flow_control_ticketholder.cpp @@ -98,31 +98,25 @@ void FlowControlTicketholder::getTicket(OperationContext* opCtx, ++stats->acquireWaitCount; } - // Make sure operations already waiting on a Flow Control ticket during shut down do not - // hang if the ticket refresher thread has been shut down. - while (_tickets == 0 && !_inShutdown) { - stats->waiting = true; - const std::uint64_t startWaitTime = curTimeMicros64(); - - // This method will wait forever for a ticket. However, it will wake up every so often to - // update the time spent waiting on the ticket. - auto waitDeadline = Date_t::now() + Milliseconds(500); - StatusWith<stdx::cv_status> swCondStatus = - opCtx->waitForConditionOrInterruptNoAssertUntil(_cv, lk, waitDeadline); - - auto waitTime = curTimeMicros64() - startWaitTime; - _totalTimeAcquiringMicros.fetchAndAddRelaxed(waitTime); - stats->timeAcquiringMicros += waitTime; - - // If the operation context state interrupted this wait, the StatusWith result will contain - // the error. If the `waitDeadline` expired, the Status variable will be OK, and the - // `cv_status` value will be `cv_status::timeout`. In either case where Status::OK is - // returned, the loop must re-check the predicate. If the operation context is interrupted - // (and an error status is returned), the intended behavior is to bubble an exception up to - // the user. - uassertStatusOK(swCondStatus); + auto currentWaitTime = curTimeMicros64(); + auto updateTotalTime = [&]() { + auto oldWaitTime = std::exchange(currentWaitTime, curTimeMicros64()); + _totalTimeAcquiringMicros.fetchAndAddRelaxed(currentWaitTime - oldWaitTime); + }; + + stats->waiting = true; + ON_BLOCK_EXIT([&] { + // When this block exits, update the time one last time and note that getTicket() is no + // longer waiting. + updateTotalTime(); + stats->waiting = false; + }); + + // getTicket() should block until there are tickets or the Ticketholder is in shutdown + while (!opCtx->waitForConditionOrInterruptFor( + _cv, lk, Milliseconds(500), [&] { return _tickets > 0 || _inShutdown; })) { + updateTotalTime(); } - stats->waiting = false; if (_inShutdown) { return; |