diff options
| author | Sophia Tan <sophia_tll@hotmail.com> | 2023-05-12 19:44:44 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-15 23:20:28 +0000 |
| commit | 6be86d8987dbad1c33160ef1779b598bc7cfa6b4 (patch) | |
| tree | b3484e6c70e402ddf66482df828c3b3f221457b3 /src/mongo/db/repl/tenant_migration_util.cpp | |
| parent | ba0986ac66e3a22d211ad3707ad037fdc10910af (diff) | |
| download | mongo-6be86d8987dbad1c33160ef1779b598bc7cfa6b4.tar.gz | |
SERVER-75276 writeConflictRetry should properly be using a NamespaceStringOrUUID instead of a StringData
Diffstat (limited to 'src/mongo/db/repl/tenant_migration_util.cpp')
| -rw-r--r-- | src/mongo/db/repl/tenant_migration_util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/repl/tenant_migration_util.cpp b/src/mongo/db/repl/tenant_migration_util.cpp index 511a16d3405..b97faca5845 100644 --- a/src/mongo/db/repl/tenant_migration_util.cpp +++ b/src/mongo/db/repl/tenant_migration_util.cpp @@ -138,7 +138,7 @@ repl::OpTime storeExternalClusterTimeKeyDocs(std::vector<ExternalKeysCollectionD AcquisitionPrerequisites::kWrite), MODE_IX); - writeConflictRetry(opCtx, "CloneExternalKeyDocs", nss.ns(), [&] { + writeConflictRetry(opCtx, "CloneExternalKeyDocs", nss, [&] { // Note that each external key's _id is generated by the migration, so this upsert can // only insert. const auto filter = @@ -158,7 +158,7 @@ repl::OpTime storeExternalClusterTimeKeyDocs(std::vector<ExternalKeysCollectionD void createOplogViewForTenantMigrations(OperationContext* opCtx, Database* db) { writeConflictRetry( - opCtx, "createDonorOplogView", NamespaceString::kTenantMigrationOplogView.ns(), [&] { + opCtx, "createDonorOplogView", NamespaceString::kTenantMigrationOplogView, [&] { { // Create 'system.views' in a separate WUOW if it does not exist. WriteUnitOfWork wuow(opCtx); @@ -619,7 +619,7 @@ ExecutorFuture<void> markExternalKeysAsGarbageCollectable( MODE_IX); writeConflictRetry( - opCtx, "TenantMigrationMarkExternalKeysAsGarbageCollectable", nss.ns(), [&] { + opCtx, "TenantMigrationMarkExternalKeysAsGarbageCollectable", nss, [&] { auto request = UpdateRequest(); request.setNamespaceString(nss); request.setQuery( |