summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/shard_local.cpp
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2020-09-17 17:09:19 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-09-26 02:12:49 +0000
commit2b82ab88982566114d1bb7667477b71c883b0799 (patch)
treec152b35ff047fdc42f69aa6cd6b04fee1d811fe4 /src/mongo/db/s/shard_local.cpp
parent08e92a678a1ed288f6a95e7950597e082556ae59 (diff)
downloadmongo-2b82ab88982566114d1bb7667477b71c883b0799.tar.gz
SERVER-50984 Add CollectionPtr to replace usage of const Collection*
It implements a yieldable interface that is used to re-load the Collection pointer from the catalog after a yield that released locks. With lock-free reads and copy-on-write on Collection instances releasing locks without notifying an AutoGetCollection at a higher level may cause its pointers to dangle if a MODE_X writer installs a new Collection instance in the catalog. CollectionPtr should be passed by const reference so a yield can notify all the way up.
Diffstat (limited to 'src/mongo/db/s/shard_local.cpp')
-rw-r--r--src/mongo/db/s/shard_local.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/s/shard_local.cpp b/src/mongo/db/s/shard_local.cpp
index 9b432100426..8b293435bfb 100644
--- a/src/mongo/db/s/shard_local.cpp
+++ b/src/mongo/db/s/shard_local.cpp
@@ -127,9 +127,11 @@ Status ShardLocal::createIndexOnConfig(OperationContext* opCtx,
invariant(ns.db() == "config" || ns.db() == "admin");
try {
+ // TODO SERVER-50983: Create abstraction for creating collection when using
+ // AutoGetCollection
AutoGetOrCreateDb autoDb(opCtx, ns.db(), MODE_IX);
AutoGetCollection autoColl(opCtx, ns, MODE_X);
- auto collection = autoColl.getCollection();
+ const Collection* collection = autoColl.getCollection().get();
if (!collection) {
CollectionOptions options;
options.uuid = UUID::gen();