SERVER-20544 prioritize reporting cancellation over reporting network error if we were canceled before we failed to get a connection from the pool

1 files changed, 5 insertions, 2 deletions

diff --git a/src/mongo/executor/network_interface_asio.cpp b/src/mongo/executor/network_interface_asio.cpp
index af387c9dda1..c8e8c129008 100644
--- a/src/mongo/executor/network_interface_asio.cpp
+++ b/src/mongo/executor/network_interface_asio.cpp
@@ -161,12 +161,15 @@ void NetworkInterfaceASIO::startCommand(const TaskExecutor::CallbackHandle& cbHa
         StatusWith<ConnectionPool::ConnectionHandle> swConn) {
 
         if (!swConn.isOK()) {
+            bool wasPreviouslyCanceled = false;
             {
                 stdx::lock_guard<stdx::mutex> lk(_inProgressMutex);
-                _inGetConnection.erase(cbHandle);
+                wasPreviouslyCanceled = _inGetConnection.erase(cbHandle) == 0;
             }
 
-            onFinish(swConn.getStatus());
+            onFinish(wasPreviouslyCanceled
+                         ? Status(ErrorCodes::CallbackCanceled, "Callback canceled")
+                         : swConn.getStatus());
             signalWorkAvailable();
             return;
         }