SERVER-53283 Remove code that patches up sharding metadata on FCV upgrade/downgrade to/from 4.9

1 files changed, 0 insertions, 24 deletions

diff --git a/src/mongo/db/s/sharding_ddl_coordinator_service.cpp b/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
index bf21a715361..7e239e6d2a9 100644
--- a/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
+++ b/src/mongo/db/s/sharding_ddl_coordinator_service.cpp
@@ -96,12 +96,6 @@ ShardingDDLCoordinatorService* ShardingDDLCoordinatorService::getService(Operati
 std::shared_ptr<ShardingDDLCoordinatorService::Instance>
 ShardingDDLCoordinatorService::constructInstance(BSONObj initialState) {
     auto coord = constructShardingDDLCoordinatorInstance(this, std::move(initialState));
-
-    {
-        stdx::lock_guard lg(_completionMutex);
-        ++_numActiveCoordinators;
-    }
-
     coord->getConstructionCompletionFuture()
         .thenRunOn(getInstanceCleanupExecutor())
         .getAsync([this](auto status) {
@@ -115,27 +109,9 @@ ShardingDDLCoordinatorService::constructInstance(BSONObj initialState) {
                 _recoveredCV.notify_all();
             }
         });
-
-    coord->getCompletionFuture()
-        .thenRunOn(getInstanceCleanupExecutor())
-        .getAsync([this](auto status) {
-            stdx::lock_guard lg(_completionMutex);
-            if (--_numActiveCoordinators == 0) {
-                _completedCV.notify_all();
-            }
-        });
-
     return coord;
 }
 
-void ShardingDDLCoordinatorService::waitForAllCoordinatorsToComplete(
-    OperationContext* opCtx) const {
-    _waitForRecoveryCompletion(opCtx);
-    stdx::unique_lock lk(_completionMutex);
-    opCtx->waitForConditionOrInterrupt(
-        _completedCV, lk, [this]() { return _numActiveCoordinators == 0; });
-}
-
 
 void ShardingDDLCoordinatorService::_afterStepDown() {
     stdx::lock_guard lg(_mutex);