SERVER-25662 ReplicationCoordinatorImpl::shutdown() should release data replicator shared_ptr before shutting down external state

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index e820bbb1f18..2e722da577e 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -731,7 +731,12 @@ void ReplicationCoordinatorImpl::shutdown(OperationContext* txn) {
 
     // joining the replication executor is blocking so it must be run outside of the mutex
     if (drCopy) {
-        drCopy->shutdown(txn);
+        LOG(1) << "ReplicationCoordinatorImpl::shutdown calling DataReplicator::shutdown.";
+        const auto status = drCopy->shutdown(txn);
+        if (!status.isOK()) {
+            warning() << "DataReplicator shutdown failed: " << status;
+        }
+        drCopy.reset();
     }
     _externalState->shutdown(txn);
     _replExecutor.shutdown();