SERVER-20465 Cancel AsyncOp timeouts when operation completes

1 files changed, 11 insertions, 3 deletions

diff --git a/src/mongo/executor/async_timer_mock.cpp b/src/mongo/executor/async_timer_mock.cpp
index 6b6a8814fe6..7460e840993 100644
--- a/src/mongo/executor/async_timer_mock.cpp
+++ b/src/mongo/executor/async_timer_mock.cpp
@@ -39,6 +39,10 @@ const Milliseconds kZeroMilliseconds = Milliseconds(0);
 
 AsyncTimerMockImpl::AsyncTimerMockImpl(Milliseconds expiration) : _timeLeft(expiration) {}
 
+void AsyncTimerMockImpl::cancel() {
+    _callAllHandlers(asio::error::operation_aborted);
+}
+
 void AsyncTimerMockImpl::asyncWait(AsyncTimerInterface::Handler handler) {
     // If we have expired, run handler now instead of storing.
     if (_timeLeft == kZeroMilliseconds) {
@@ -64,20 +68,24 @@ Milliseconds AsyncTimerMockImpl::timeLeft() {
     return _timeLeft;
 }
 
-void AsyncTimerMockImpl::_callAllHandlers() {
+void AsyncTimerMockImpl::_callAllHandlers(std::error_code ec) {
     for (auto elem = _handlers.begin(); elem != _handlers.end(); elem++) {
         const auto& handler = *elem;
-        handler(std::error_code());
+        handler(ec);
     }
     _handlers.clear();
 }
 
 void AsyncTimerMockImpl::_expire() {
-    _callAllHandlers();
+    _callAllHandlers(std::error_code());
 }
 
 AsyncTimerMock::AsyncTimerMock(std::shared_ptr<AsyncTimerMockImpl> timer) : _timer(timer) {}
 
+void AsyncTimerMock::cancel() {
+    _timer->cancel();
+}
+
 void AsyncTimerMock::asyncWait(AsyncTimerInterface::Handler handler) {
     _timer->asyncWait(handler);
 }