diff options
| author | Jordi Serra Torrens <jordi.serra-torrens@mongodb.com> | 2023-05-16 10:14:21 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-16 11:26:10 +0000 |
| commit | 69212b824a786bbc627dc4accdcbfaccfda12e15 (patch) | |
| tree | 4951d5873371e1a961edf1afa0a3e46f141b2869 /src/mongo/db/s | |
| parent | 279531ef0dbaf8f6df0e25341425eb57d75a21ea (diff) | |
| download | mongo-69212b824a786bbc627dc4accdcbfaccfda12e15.tar.gz | |
SERVER-77125 Avoid unnecessary construction of NamespaceString on collection acquisitions
Diffstat (limited to 'src/mongo/db/s')
4 files changed, 18 insertions, 19 deletions
diff --git a/src/mongo/db/s/resharding/resharding_donor_service.cpp b/src/mongo/db/s/resharding/resharding_donor_service.cpp index d0a81bb656d..3928c97558c 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service.cpp @@ -999,7 +999,7 @@ void ReshardingDonorService::DonorStateMachine::_updateDonorDocument( writeConflictRetry(opCtx.get(), "DonorStateMachine::_updateDonorDocument", nss, [&] { auto coll = acquireCollection( opCtx.get(), - CollectionAcquisitionRequest(NamespaceString(nss), + CollectionAcquisitionRequest(nss, PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, repl::ReadConcernArgs::get(opCtx.get()), AcquisitionPrerequisites::kWrite), @@ -1031,7 +1031,7 @@ void ReshardingDonorService::DonorStateMachine::_removeDonorDocument( writeConflictRetry(opCtx.get(), "DonorStateMachine::_removeDonorDocument", nss, [&] { const auto coll = acquireCollection( opCtx.get(), - CollectionAcquisitionRequest(NamespaceString(nss), + CollectionAcquisitionRequest(nss, PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, repl::ReadConcernArgs::get(opCtx.get()), AcquisitionPrerequisites::kWrite), diff --git a/src/mongo/db/s/resharding/resharding_recipient_service.cpp b/src/mongo/db/s/resharding/resharding_recipient_service.cpp index 6328f3066fe..baec5096e1c 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service.cpp @@ -1123,7 +1123,7 @@ void ReshardingRecipientService::RecipientStateMachine::_removeRecipientDocument writeConflictRetry(opCtx.get(), "RecipientStateMachine::_removeRecipientDocument", nss, [&] { const auto coll = acquireCollection( opCtx.get(), - CollectionAcquisitionRequest(NamespaceString(nss), + CollectionAcquisitionRequest(nss, PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, repl::ReadConcernArgs::get(opCtx.get()), AcquisitionPrerequisites::kWrite), diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp index dc385b0449c..dedfd3ddc9d 100644 --- a/src/mongo/db/s/sharding_initialization_mongod.cpp +++ b/src/mongo/db/s/sharding_initialization_mongod.cpp @@ -507,14 +507,13 @@ void ShardingInitializationMongoD::updateShardIdentityConfigString( write_ops::UpdateModification::parseFromClassicUpdate(updateObj)); try { - auto collection = - acquireCollection(opCtx, - CollectionAcquisitionRequest( - NamespaceString(NamespaceString::kServerConfigurationNamespace), - PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, - repl::ReadConcernArgs::get(opCtx), - AcquisitionPrerequisites::kWrite), - MODE_IX); + auto collection = acquireCollection( + opCtx, + CollectionAcquisitionRequest(NamespaceString::kServerConfigurationNamespace, + PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, + repl::ReadConcernArgs::get(opCtx), + AcquisitionPrerequisites::kWrite), + MODE_IX); auto result = update(opCtx, collection, updateReq); if (result.numMatched == 0) { LOGV2_WARNING(22076, diff --git a/src/mongo/db/s/sharding_state_recovery.cpp b/src/mongo/db/s/sharding_state_recovery.cpp index 70d037ef865..ee70ac7acc6 100644 --- a/src/mongo/db/s/sharding_state_recovery.cpp +++ b/src/mongo/db/s/sharding_state_recovery.cpp @@ -147,14 +147,14 @@ Status modifyRecoveryDocument(OperationContext* opCtx, const WriteConcernOptions& writeConcern) { try { { - auto collection = acquireCollection( - opCtx, - CollectionAcquisitionRequest( - NamespaceString(NamespaceString::kServerConfigurationNamespace), - PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, - repl::ReadConcernArgs::get(opCtx), - AcquisitionPrerequisites::kWrite), - MODE_X); + auto collection = + acquireCollection(opCtx, + CollectionAcquisitionRequest( + NamespaceString::kServerConfigurationNamespace, + PlacementConcern{boost::none, ShardVersion::UNSHARDED()}, + repl::ReadConcernArgs::get(opCtx), + AcquisitionPrerequisites::kWrite), + MODE_X); const auto configOpTime = [&]() { const auto vcTime = VectorClock::get(opCtx)->getTime(); |