SERVER-27624 SyncSourceFeedback should check for shutdown before setting _reporter

(cherry picked from commit 2264c7411e119e6c3c8198f6c31f641e65b9f3cb)

2 files changed, 8 insertions, 9 deletions

diff --git a/src/mongo/db/repl/sync_source_feedback.cpp b/src/mongo/db/repl/sync_source_feedback.cpp
index 96ac055f792..c384fe6cf9b 100644
--- a/src/mongo/db/repl/sync_source_feedback.cpp
+++ b/src/mongo/db/repl/sync_source_feedback.cpp
@@ -114,13 +114,9 @@ void SyncSourceFeedback::forwardSlaveProgress() {
     }
 }
 
-Status SyncSourceFeedback::_updateUpstream(OperationContext* txn, BackgroundSync* bgsync) {
-    Reporter* reporter;
-    {
-        stdx::lock_guard<stdx::mutex> lock(_mtx);
-        reporter = _reporter;
-    }
-
+Status SyncSourceFeedback::_updateUpstream(OperationContext* txn,
+                                           BackgroundSync* bgsync,
+                                           Reporter* reporter) {
     auto syncTarget = reporter->getTarget();
 
     auto triggerStatus = reporter->trigger();
@@ -240,6 +236,9 @@ void SyncSourceFeedback::run(executor::TaskExecutor* executor, BackgroundSync* b
             keepAliveInterval);
         {
             stdx::lock_guard<stdx::mutex> lock(_mtx);
+            if (_shutdownSignaled) {
+                break;
+            }
             _reporter = &reporter;
         }
         ON_BLOCK_EXIT([this]() {
@@ -247,7 +246,7 @@ void SyncSourceFeedback::run(executor::TaskExecutor* executor, BackgroundSync* b
             _reporter = nullptr;
         });
 
-        auto status = _updateUpstream(txn.get(), bgsync);
+        auto status = _updateUpstream(txn.get(), bgsync, &reporter);
         if (!status.isOK()) {
             LOG(1) << "The replication progress command (replSetUpdatePosition) failed and will be "
                       "retried: "
diff --git a/src/mongo/db/repl/sync_source_feedback.h b/src/mongo/db/repl/sync_source_feedback.h
index c8f20b614be..40c29dc172a 100644
--- a/src/mongo/db/repl/sync_source_feedback.h
+++ b/src/mongo/db/repl/sync_source_feedback.h
@@ -72,7 +72,7 @@ private:
     /* Inform the sync target of our current position in the oplog, as well as the positions
      * of all secondaries chained through us.
      */
-    Status _updateUpstream(OperationContext* txn, BackgroundSync* bgsync);
+    Status _updateUpstream(OperationContext* txn, BackgroundSync* bgsync, Reporter* reporter);
 
     // protects cond, _shutdownSignaled, _keepAliveInterval, and _positionChanged.
     stdx::mutex _mtx;