New upstream version 6.0.20upstream

1 files changed, 48 insertions, 43 deletions

diff --git a/src/mongo/db/repl/collection_bulk_loader_impl.cpp b/src/mongo/db/repl/collection_bulk_loader_impl.cpp
index 73f86c67c59..eb39fdadd55 100644
--- a/src/mongo/db/repl/collection_bulk_loader_impl.cpp
+++ b/src/mongo/db/repl/collection_bulk_loader_impl.cpp
@@ -82,49 +82,54 @@ Status CollectionBulkLoaderImpl::init(const std::vector<BSONObj>& secondaryIndex
         // locks as yielding a MODE_X/MODE_S lock isn't allowed.
         _secondaryIndexesBlock->setIndexBuildMethod(IndexBuildMethod::kForeground);
         _idIndexBlock->setIndexBuildMethod(IndexBuildMethod::kForeground);
-        return writeConflictRetry(
-            _opCtx.get(),
-            "CollectionBulkLoader::init",
-            _collection->getNss().ns(),
-            [&secondaryIndexSpecs, this] {
-                WriteUnitOfWork wuow(_opCtx.get());
-                // All writes in CollectionBulkLoaderImpl should be unreplicated.
-                // The opCtx is accessed indirectly through _secondaryIndexesBlock.
-                UnreplicatedWritesBlock uwb(_opCtx.get());
-                // This enforces the buildIndexes setting in the replica set configuration.
-                CollectionWriter collWriter(_opCtx.get(), *_collection);
-                auto indexCatalog = collWriter.getWritableCollection()->getIndexCatalog();
-                auto specs = indexCatalog->removeExistingIndexesNoChecks(
-                    _opCtx.get(), collWriter.get(), secondaryIndexSpecs);
-                if (specs.size()) {
-                    _secondaryIndexesBlock->ignoreUniqueConstraint();
-                    auto status =
-                        _secondaryIndexesBlock
-                            ->init(_opCtx.get(), collWriter, specs, MultiIndexBlock::kNoopOnInitFn)
-                            .getStatus();
-                    if (!status.isOK()) {
-                        return status;
-                    }
-                } else {
-                    _secondaryIndexesBlock.reset();
-                }
-                if (!_idIndexSpec.isEmpty()) {
-                    auto status = _idIndexBlock
-                                      ->init(_opCtx.get(),
-                                             collWriter,
-                                             _idIndexSpec,
-                                             MultiIndexBlock::kNoopOnInitFn)
-                                      .getStatus();
-                    if (!status.isOK()) {
-                        return status;
-                    }
-                } else {
-                    _idIndexBlock.reset();
-                }
-
-                wuow.commit();
-                return Status::OK();
-            });
+        return writeConflictRetry(_opCtx.get(),
+                                  "CollectionBulkLoader::init",
+                                  _collection->getNss().ns(),
+                                  [&secondaryIndexSpecs, this] {
+                                      WriteUnitOfWork wuow(_opCtx.get());
+                                      // All writes in CollectionBulkLoaderImpl should be
+                                      // unreplicated. The opCtx is accessed indirectly through
+                                      // _secondaryIndexesBlock.
+                                      UnreplicatedWritesBlock uwb(_opCtx.get());
+                                      // This enforces the buildIndexes setting in the replica set
+                                      // configuration.
+                                      CollectionWriter collWriter(_opCtx.get(), *_collection);
+                                      auto indexCatalog =
+                                          collWriter.getWritableCollection()->getIndexCatalog();
+                                      auto specs = indexCatalog->removeExistingIndexesNoChecks(
+                                          _opCtx.get(), collWriter.get(), secondaryIndexSpecs);
+                                      if (specs.size()) {
+                                          _secondaryIndexesBlock->ignoreUniqueConstraint();
+                                          auto status = _secondaryIndexesBlock
+                                                            ->init(_opCtx.get(),
+                                                                   collWriter,
+                                                                   specs,
+                                                                   MultiIndexBlock::kNoopOnInitFn,
+                                                                   /*forRecovery=*/false)
+                                                            .getStatus();
+                                          if (!status.isOK()) {
+                                              return status;
+                                          }
+                                      } else {
+                                          _secondaryIndexesBlock.reset();
+                                      }
+                                      if (!_idIndexSpec.isEmpty()) {
+                                          auto status = _idIndexBlock
+                                                            ->init(_opCtx.get(),
+                                                                   collWriter,
+                                                                   _idIndexSpec,
+                                                                   MultiIndexBlock::kNoopOnInitFn)
+                                                            .getStatus();
+                                          if (!status.isOK()) {
+                                              return status;
+                                          }
+                                      } else {
+                                          _idIndexBlock.reset();
+                                      }
+
+                                      wuow.commit();
+                                      return Status::OK();
+                                  });
     });
 }