summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/repl/tenant_migration_shard_merge_util.cpp')
-rw-r--r--src/mongo/db/repl/tenant_migration_shard_merge_util.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp b/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
index 8e508f2519f..ae0e4b0bb5e 100644
--- a/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
+++ b/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
@@ -190,16 +190,14 @@ void wiredTigerImportFromBackupCursor(OperationContext* opCtx,
});
// Create Collection object
- TenantNamespace tenantNs(getActiveTenant(opCtx), nss);
auto storageEngine = opCtx->getServiceContext()->getStorageEngine();
auto durableCatalog = storageEngine->getCatalog();
ImportOptions importOptions(ImportOptions::ImportCollectionUUIDOption::kKeepOld);
importOptions.importTimestampRule = ImportOptions::ImportTimestampRule::kStable;
- // TODO SERVER-62659 Ensure the correct tenantId is used when importing the collection.
auto importResult = uassertStatusOK(
DurableCatalog::get(opCtx)->importCollection(opCtx,
- tenantNs,
+ collectionMetadata.ns,
collectionMetadata.catalogObject,
storageMetadata.done(),
importOptions));
@@ -209,7 +207,7 @@ void wiredTigerImportFromBackupCursor(OperationContext* opCtx,
}
std::shared_ptr<Collection> ownedCollection = Collection::Factory::get(opCtx)->make(
- opCtx, tenantNs, importResult.catalogId, md, std::move(importResult.rs));
+ opCtx, nss, importResult.catalogId, md, std::move(importResult.rs));
ownedCollection->init(opCtx);
ownedCollection->setCommitted(false);