diff options
| author | Daniel Gottlieb <daniel.gottlieb@mongodb.com> | 2019-11-26 04:48:50 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-11-26 04:48:50 +0000 |
| commit | d471957fc37ef6cafe9ffeda3e231cdc871c3ce3 (patch) | |
| tree | 3435c9d9420243e350da0f3dfbeecb81afbcd264 /src/mongo/db/catalog_raii.cpp | |
| parent | 8b0f534a706005d366e200ee56af5c76217656b2 (diff) | |
| download | mongo-d471957fc37ef6cafe9ffeda3e231cdc871c3ce3.tar.gz | |
SERVER-43859: Take MODE_IX locks for collection creation.
Two concurrent storage transactions can now create collections with the same
collection name. These transactions will conflict at commit time; the first
committer will win and register their collection into the global catalog. The
losing transactions will bubble a WriteConflictException.
Top-level callers that should fail if the collection already existed must now
check and fail with a NamespaceExists error code. Previously, those callers
could rely on lower level code returning the NamespaceExists error.
Callers that were implicitly creating a collection may retry the operation,
using the now-registered collection.
These transaction-local collections (UncommittedCollections) are returned when
doing any CollectionCatalog::lookup* call.
Diffstat (limited to 'src/mongo/db/catalog_raii.cpp')
| -rw-r--r-- | src/mongo/db/catalog_raii.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp index cd69d4d4274..156727191dd 100644 --- a/src/mongo/db/catalog_raii.cpp +++ b/src/mongo/db/catalog_raii.cpp @@ -70,7 +70,7 @@ AutoGetCollection::AutoGetCollection(OperationContext* opCtx, } _collLock.emplace(opCtx, nsOrUUID, modeColl, deadline); - _resolvedNss = CollectionCatalog::get(opCtx).resolveNamespaceStringOrUUID(nsOrUUID); + _resolvedNss = CollectionCatalog::get(opCtx).resolveNamespaceStringOrUUID(opCtx, nsOrUUID); // Wait for a configured amount of time after acquiring locks if the failpoint is enabled setAutoGetCollectionWait.execute( @@ -95,7 +95,7 @@ AutoGetCollection::AutoGetCollection(OperationContext* opCtx, if (!db) return; - _coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace(_resolvedNss); + _coll = CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, _resolvedNss); invariant(!nsOrUUID.uuid() || _coll, str::stream() << "Collection for " << _resolvedNss.ns() << " disappeared after successufully resolving " |