SERVER-31347 Remove SessionCatalogMigrationDestination::waitUntilReadyToCommit call in MigrationDestinationManager

3 files changed, 0 insertions, 15 deletions

diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp
index 0dd4967c9f5..8a3c72436f8 100644
--- a/src/mongo/db/s/migration_destination_manager.cpp
+++ b/src/mongo/db/s/migration_destination_manager.cpp
@@ -846,8 +846,6 @@ void MigrationDestinationManager::_migrateDriver(OperationContext* opCtx,
             setStateFail("Cannot go to critical section because secondaries cannot keep up");
             return;
         }
-
-        _sessionMigration->waitUntilReadyToCommit(opCtx);
     }
 
     {
diff --git a/src/mongo/db/s/session_catalog_migration_destination.cpp b/src/mongo/db/s/session_catalog_migration_destination.cpp
index 05aec22193b..863d268257d 100644
--- a/src/mongo/db/s/session_catalog_migration_destination.cpp
+++ b/src/mongo/db/s/session_catalog_migration_destination.cpp
@@ -483,11 +483,4 @@ void SessionCatalogMigrationDestination::forceFail(std::string& errMsg) {
     _errorOccurred(errMsg);
 }
 
-void SessionCatalogMigrationDestination::waitUntilReadyToCommit(OperationContext* opCtx) {
-    stdx::unique_lock<stdx::mutex> lk(_mutex);
-    while (_state == State::Migrating) {
-        opCtx->waitForConditionOrInterrupt(_isStateChanged, lk);
-    }
-}
-
 }  // namespace mongo
diff --git a/src/mongo/db/s/session_catalog_migration_destination.h b/src/mongo/db/s/session_catalog_migration_destination.h
index a67bd8012f6..1024d1686cf 100644
--- a/src/mongo/db/s/session_catalog_migration_destination.h
+++ b/src/mongo/db/s/session_catalog_migration_destination.h
@@ -94,12 +94,6 @@ public:
     void forceFail(std::string& errMsg);
 
     /**
-     * Blocks until state changes is not Migrating. In other words, can return when state
-     * becomes ReadyToCommit/Done/ErrorOccurred, etc.
-     */
-    void waitUntilReadyToCommit(OperationContext* opCtx);
-
-    /**
      * Returns the current state.
      */
     State getState();