SERVER-75443 PinnedConnectionTaskExecutor::join waits for in-progress requests to finish even if they are already out of the request queue

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mongo/executor/pinned_connection_task_executor.cpp b/src/mongo/executor/pinned_connection_task_executor.cpp
index b8270346bbf..727726e59c3 100644
--- a/src/mongo/executor/pinned_connection_task_executor.cpp
+++ b/src/mongo/executor/pinned_connection_task_executor.cpp
@@ -337,15 +337,12 @@ void PinnedConnectionTaskExecutor::join() {
     }
     invariant(_state == State::joinRequired || _state == State::joining);
     _state = State::joining;
-    if (_requestQueue.empty()) {
-        _state = State::shutdownComplete;
-        return;
-    }
-    // If the _requestQueue isn't empty, there must still be some thread
-    // doing networking, which will observe the cancellations we did above.
-    invariant(_isDoingNetworking);
+
     _requestQueueEmptyCV.wait(lk,
                               [this]() { return _requestQueue.empty() && !_isDoingNetworking; });
+
+    _executor->join();
+
     _state = State::shutdownComplete;
     return;
 }