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/dbhelpers.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/dbhelpers.cpp')
| -rw-r--r-- | src/mongo/db/dbhelpers.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/dbhelpers.cpp b/src/mongo/db/dbhelpers.cpp index 7c1e045f497..e7748aa1e9a 100644 --- a/src/mongo/db/dbhelpers.cpp +++ b/src/mongo/db/dbhelpers.cpp @@ -139,7 +139,7 @@ bool Helpers::findById(OperationContext* opCtx, invariant(database); Collection* collection = - CollectionCatalog::get(opCtx).lookupCollectionByNamespace(NamespaceString(ns)); + CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, NamespaceString(ns)); if (!collection) { return false; } @@ -263,8 +263,9 @@ BSONObj Helpers::inferKeyPattern(const BSONObj& o) { void Helpers::emptyCollection(OperationContext* opCtx, const NamespaceString& nss) { OldClientContext context(opCtx, nss.ns()); repl::UnreplicatedWritesBlock uwb(opCtx); - Collection* collection = - context.db() ? CollectionCatalog::get(opCtx).lookupCollectionByNamespace(nss) : nullptr; + Collection* collection = context.db() + ? CollectionCatalog::get(opCtx).lookupCollectionByNamespace(opCtx, nss) + : nullptr; deleteObjects(opCtx, collection, nss, BSONObj(), false); } |