diff options
Diffstat (limited to 'src/mongo/db/s/shardsvr_shard_collection.cpp')
| -rw-r--r-- | src/mongo/db/s/shardsvr_shard_collection.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/mongo/db/s/shardsvr_shard_collection.cpp b/src/mongo/db/s/shardsvr_shard_collection.cpp index 2bbf98f14b5..005c82005bb 100644 --- a/src/mongo/db/s/shardsvr_shard_collection.cpp +++ b/src/mongo/db/s/shardsvr_shard_collection.cpp @@ -76,7 +76,6 @@ MONGO_FAIL_POINT_DEFINE(pauseShardCollectionBeforeCriticalSection); MONGO_FAIL_POINT_DEFINE(pauseShardCollectionReadOnlyCriticalSection); MONGO_FAIL_POINT_DEFINE(pauseShardCollectionCommitPhase); MONGO_FAIL_POINT_DEFINE(pauseShardCollectionAfterCriticalSection); -MONGO_FAIL_POINT_DEFINE(pauseShardCollectionBeforeReturning); struct ShardCollectionTargetState { UUID uuid; @@ -434,12 +433,7 @@ void writeFirstChunksToConfig(OperationContext* opCtx, std::vector<BSONObj> chunkObjs; chunkObjs.reserve(initialChunks.chunks.size()); for (const auto& chunk : initialChunks.chunks) { - if (serverGlobalParams.featureCompatibility.getVersion() >= - ServerGlobalParams::FeatureCompatibility::Version::kUpgradingTo44) { - chunkObjs.push_back(chunk.toConfigBSON()); - } else { - chunkObjs.push_back(chunk.toConfigBSONLegacyID()); - } + chunkObjs.push_back(chunk.toConfigBSON()); } Grid::get(opCtx)->catalogClient()->insertConfigDocumentsAsRetryableWrite( @@ -691,11 +685,6 @@ public: str::stream() << "Collection " << nss << " is sharded without UUID", uuid); - if (MONGO_unlikely(pauseShardCollectionBeforeReturning.shouldFail())) { - LOGV2(22102, "Hit pauseShardCollectionBeforeReturning"); - pauseShardCollectionBeforeReturning.pauseWhileSet(opCtx); - } - scopedShardCollection.emplaceUUID(uuid); } |