SERVER-34796 Make _cleanup in movePrimary only clear the DSS if the db exists

1 files changed, 5 insertions, 9 deletions

diff --git a/src/mongo/db/s/move_primary_source_manager.cpp b/src/mongo/db/s/move_primary_source_manager.cpp
index 6af77e7b492..2bfd92cedfb 100644
--- a/src/mongo/db/s/move_primary_source_manager.cpp
+++ b/src/mongo/db/s/move_primary_source_manager.cpp
@@ -349,16 +349,12 @@ void MovePrimarySourceManager::_cleanup(OperationContext* opCtx) {
         UninterruptibleLockGuard noInterrupt(opCtx->lockState());
         AutoGetDb autoDb(opCtx, getNss().toString(), MODE_X);
 
-        if (!autoDb.getDb()) {
-            uasserted(ErrorCodes::ConflictingOperationInProgress,
-                      str::stream() << "The database " << getNss().toString()
-                                    << " was dropped during the movePrimary operation.");
-        }
-
-        DatabaseShardingState::get(autoDb.getDb()).clearMovePrimarySourceManager(opCtx);
+        if (autoDb.getDb()) {
+            DatabaseShardingState::get(autoDb.getDb()).clearMovePrimarySourceManager(opCtx);
 
-        // Leave the critical section if we're still registered.
-        DatabaseShardingState::get(autoDb.getDb()).exitCriticalSection(opCtx, boost::none);
+            // Leave the critical section if we're still registered.
+            DatabaseShardingState::get(autoDb.getDb()).exitCriticalSection(opCtx, boost::none);
+        }
     }
 
     if (_state == kCriticalSection || _state == kCloneCompleted) {