summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorChristopher Caplinger <christopher.caplinger@mongodb.com>2022-08-04 17:08:55 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-08-04 18:36:19 +0000
commitaef31ad1a0d47dcd3851161a269d5cc76f83f819 (patch)
treef1373aeb057ea9f4bad30de051ab351691888204 /src/mongo/db/ops
parent2bddb8f08fbeb742f30e0489115f0c5eb5a4b97a (diff)
downloadmongo-aef31ad1a0d47dcd3851161a269d5cc76f83f819.tar.gz
SERVER-64616: Install recipient access blocker when applying "create" entry
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/write_ops_exec.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/ops/write_ops_exec.cpp b/src/mongo/db/ops/write_ops_exec.cpp
index 297b6c8c0bf..9bbd2871678 100644
--- a/src/mongo/db/ops/write_ops_exec.cpp
+++ b/src/mongo/db/ops/write_ops_exec.cpp
@@ -322,7 +322,7 @@ bool handleError(OperationContext* opCtx,
auto migrationConflictInfo = ex.toStatus().extraInfo<TenantMigrationConflictInfo>();
uassertStatusOK(
Status(NonRetryableTenantMigrationConflictInfo(
- migrationConflictInfo->getTenantId(),
+ migrationConflictInfo->getMigrationId(),
migrationConflictInfo->getTenantMigrationAccessBlocker()),
"Multi update must block until this tenant migration commits or aborts"));
}
@@ -664,7 +664,7 @@ WriteResult performInserts(OperationContext* opCtx,
// If we are performing inserts from tenant migrations, skip checking if the user is allowed to
// write to the namespace.
- if (!repl::tenantMigrationRecipientInfo(opCtx)) {
+ if (!repl::tenantMigrationInfo(opCtx)) {
uassertStatusOK(userAllowedWriteNS(opCtx, wholeOp.getNamespace()));
}
@@ -1430,7 +1430,7 @@ Status performAtomicTimeseriesWrites(
doc_diff::applyDiff(original.value(),
update.getU().getDiff(),
&CollectionQueryInfo::get(*coll).getIndexKeys(opCtx),
- static_cast<bool>(repl::tenantMigrationRecipientInfo(opCtx)));
+ static_cast<bool>(repl::tenantMigrationInfo(opCtx)));
CollectionUpdateArgs args;
if (const auto& stmtIds = op.getStmtIds()) {