diff options
Diffstat (limited to 'src/mongo/db/cloner.cpp')
| -rw-r--r-- | src/mongo/db/cloner.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index 658996e8245..7d289892fa5 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -48,7 +48,7 @@ #include "mongo/db/cloner_gen.h" #include "mongo/db/commands.h" #include "mongo/db/commands/list_collections_filter.h" -#include "mongo/db/concurrency/exception_util.h" +#include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/curop.h" #include "mongo/db/dbdirectclient.h" #include "mongo/db/index/index_descriptor.h" @@ -71,7 +71,6 @@ namespace mongo { using IndexVersion = IndexDescriptor::IndexVersion; MONGO_FAIL_POINT_DEFINE(movePrimaryFailPoint); -MONGO_FAIL_POINT_DEFINE(movePrimaryClonerHangBeforeStartCloneDocuments); BSONElement getErrField(const BSONObj& o); @@ -409,8 +408,7 @@ Status Cloner::_createCollectionsForDb( { OperationShardingState::ScopedAllowImplicitCollectionCreate_UNSAFE - unsafeCreateCollection(opCtx, - /* forceCSRAsUnknownAfterCollectionCreation */ true); + unsafeCreateCollection(opCtx); Status createStatus = db->userCreateNS( opCtx, nss, collectionOptions, createDefaultIndexes, params.idIndexSpec); if (!createStatus.isOK()) { @@ -535,13 +533,6 @@ Status Cloner::copyDb(OperationContext* opCtx, // now build the secondary indexes for (auto&& params : createCollectionParams) { - - // Indexes of sharded collections are not copied: the primary shard is not required to - // have all indexes. The listIndexes cmd is sent to the shard owning the MinKey value. - if (params.shardedColl) { - continue; - } - LOGV2(20422, "copying indexes for: {collectionInfo}", "Copying indexes", @@ -559,8 +550,6 @@ Status Cloner::copyDb(OperationContext* opCtx, } } - movePrimaryClonerHangBeforeStartCloneDocuments.pauseWhileSet(); - for (auto&& params : createCollectionParams) { if (params.shardedColl) { continue; |