SERVER-46659 Initial sync will startup two phase index builds during the collection cloning phase to prevent a scenario where the commit quorum cannot be satisfied due to the primary node needing the initial syncing nodes vote

2 files changed, 6 insertions, 2 deletions

diff --git a/src/mongo/db/s/migration_destination_manager.cpp b/src/mongo/db/s/migration_destination_manager.cpp
index 9dfc07a5bd3..4b3a57f2e54 100644
--- a/src/mongo/db/s/migration_destination_manager.cpp
+++ b/src/mongo/db/s/migration_destination_manager.cpp
@@ -651,7 +651,9 @@ void MigrationDestinationManager::cloneCollectionIndexesAndOptions(
         // Determine which indexes exist on the local collection that don't exist on the donor's
         // collection.
         DBDirectClient client(opCtx);
-        auto indexes = client.getIndexSpecs(nss);
+        const bool includeBuildUUIDs = false;
+        const int options = 0;
+        auto indexes = client.getIndexSpecs(nss, includeBuildUUIDs, options);
         for (auto&& recipientIndex : indexes) {
             bool dropIndex = true;
             for (auto&& donorIndex : collectionOptionsAndIndexes.indexSpecs) {
diff --git a/src/mongo/db/s/shard_key_util.cpp b/src/mongo/db/s/shard_key_util.cpp
index bd0f192dd34..7bbeed2614d 100644
--- a/src/mongo/db/s/shard_key_util.cpp
+++ b/src/mongo/db/s/shard_key_util.cpp
@@ -189,7 +189,9 @@ void validateShardKeyIndexExistsOrCreateIfPossible(OperationContext* opCtx,
 
 std::vector<BSONObj> ValidationBehaviorsShardCollection::loadIndexes(
     const NamespaceString& nss) const {
-    std::list<BSONObj> indexes = _localClient->getIndexSpecs(nss);
+    const bool includeBuildUUIDs = false;
+    const int options = 0;
+    std::list<BSONObj> indexes = _localClient->getIndexSpecs(nss, includeBuildUUIDs, options);
     // Convert std::list to a std::vector.
     return std::vector<BSONObj>{std::make_move_iterator(std::begin(indexes)),
                                 std::make_move_iterator(std::end(indexes))};