SERVER-23750: wait outside of the DataReplicator mutex

2 files changed, 15 insertions, 0 deletions

diff --git a/src/mongo/client/fetcher.cpp b/src/mongo/client/fetcher.cpp
index b042a6dc0e9..4f6e831a501 100644
--- a/src/mongo/client/fetcher.cpp
+++ b/src/mongo/client/fetcher.cpp
@@ -255,6 +255,7 @@ void Fetcher::cancel() {
         }
 
         handle = _getMoreCallbackHandle;
+        _inShutdown = true;
     }
 
     _executor->cancel(handle);
@@ -288,6 +289,17 @@ void Fetcher::_callback(const RemoteCommandCallbackArgs& rcbd, const char* batch
         return;
     }
 
+    bool inShutdown = false;
+    {
+        stdx::lock_guard<stdx::mutex> lk(_mutex);
+        inShutdown = _inShutdown;
+    }
+    if (inShutdown) {
+        _work(Status(ErrorCodes::ShutdownInProgress, "fetcher shutting down"), nullptr, nullptr);
+        _finishCallback();
+        return;
+    }
+
     const BSONObj& queryResponseObj = rcbd.response.getValue().data;
     Status status = getStatusFromCommandResult(queryResponseObj);
     if (!status.isOK()) {
diff --git a/src/mongo/client/fetcher.h b/src/mongo/client/fetcher.h
index 51130535fca..b3330eb1467 100644
--- a/src/mongo/client/fetcher.h
+++ b/src/mongo/client/fetcher.h
@@ -228,6 +228,9 @@ private:
     // Using boolean instead of a counter to avoid issues with wrap around.
     bool _first = true;
 
+    // _inShutdown is true after cancel() is called.
+    bool _inShutdown = false;
+
     // Callback handle to the scheduled getMore command.
     executor::TaskExecutor::CallbackHandle _getMoreCallbackHandle;