SERVER-27011 SyncSourceResolver::startup() should return ShutdownInProgress if shutting down

1 files changed, 10 insertions, 3 deletions

diff --git a/src/mongo/db/repl/sync_source_resolver.cpp b/src/mongo/db/repl/sync_source_resolver.cpp
index 3d63256b655..dced97cef3a 100644
--- a/src/mongo/db/repl/sync_source_resolver.cpp
+++ b/src/mongo/db/repl/sync_source_resolver.cpp
@@ -94,10 +94,17 @@ bool SyncSourceResolver::_isActive_inlock() const {
 Status SyncSourceResolver::startup() {
     {
         stdx::lock_guard<stdx::mutex> lock(_mutex);
-        if (State::kPreStart != _state) {
-            return Status(ErrorCodes::IllegalOperation, "sync source resolver already started");
+        switch (_state) {
+            case State::kPreStart:
+                _state = State::kRunning;
+                break;
+            case State::kRunning:
+                return Status(ErrorCodes::IllegalOperation, "sync source resolver already started");
+            case State::kShuttingDown:
+                return Status(ErrorCodes::ShutdownInProgress, "sync source resolver shutting down");
+            case State::kComplete:
+                return Status(ErrorCodes::ShutdownInProgress, "sync source resolver completed");
         }
-        _state = State::kRunning;
     }
 
     return _chooseAndProbeNextSyncSource(OpTime());