diff options
| -rw-r--r-- | src/mongo/db/repl/tenant_migration_recipient_op_observer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mongo/db/repl/tenant_migration_recipient_op_observer.cpp b/src/mongo/db/repl/tenant_migration_recipient_op_observer.cpp index 79fa28313f4..26f8d75ba3c 100644 --- a/src/mongo/db/repl/tenant_migration_recipient_op_observer.cpp +++ b/src/mongo/db/repl/tenant_migration_recipient_op_observer.cpp @@ -288,11 +288,11 @@ void TenantMigrationRecipientOpObserver::onDelete(OperationContext* opCtx, if (nss == NamespaceString::kTenantMigrationRecipientsNamespace && !tenant_migration_access_blocker::inRecoveryMode(opCtx)) { if (tenantIdToDeleteDecoration(opCtx)) { + auto tenantId = tenantIdToDeleteDecoration(opCtx).get(); LOGV2_INFO(8423337, "Removing expired 'multitenant migration' migration"); - opCtx->recoveryUnit()->onCommit([opCtx](boost::optional<Timestamp>) { + opCtx->recoveryUnit()->onCommit([opCtx, tenantId](boost::optional<Timestamp>) { TenantMigrationAccessBlockerRegistry::get(opCtx->getServiceContext()) - .remove(tenantIdToDeleteDecoration(opCtx).get(), - TenantMigrationAccessBlocker::BlockerType::kRecipient); + .remove(tenantId, TenantMigrationAccessBlocker::BlockerType::kRecipient); }); } @@ -302,8 +302,7 @@ void TenantMigrationRecipientOpObserver::onDelete(OperationContext* opCtx, "Removing expired 'shard merge' migration", "migrationId"_attr = migrationId); TenantMigrationAccessBlockerRegistry::get(opCtx->getServiceContext()) - .removeRecipientAccessBlockersForMigration( - migrationIdToDeleteDecoration(opCtx).get()); + .removeRecipientAccessBlockersForMigration(migrationId); repl::TenantFileImporterService::get(opCtx->getServiceContext())->reset(migrationId); } } |