diff options
author | Geert Bosch <geert@mongodb.com> | 2019-04-12 13:27:54 -0400 |
---|---|---|
committer | Geert Bosch <geert@mongodb.com> | 2019-04-15 11:24:05 -0400 |
commit | 688948927bedd25c4c5c50bc7e6a253feeec4e25 (patch) | |
tree | c1beee18d1d6acf197455542a0328f0190f8dc70 /src/mongo/db/s | |
parent | 03171bed9efdf0d25054fcddd936ad04db53f4aa (diff) | |
download | mongo-688948927bedd25c4c5c50bc7e6a253feeec4e25.tar.gz |
SERVER-40604 Make CollectionLock interruptible
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r-- | src/mongo/db/s/implicit_create_collection.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/s/set_shard_version_command.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/s/implicit_create_collection.cpp b/src/mongo/db/s/implicit_create_collection.cpp index 81bf1e04631..2ba0c9f945b 100644 --- a/src/mongo/db/s/implicit_create_collection.cpp +++ b/src/mongo/db/s/implicit_create_collection.cpp @@ -97,7 +97,7 @@ public: auto databaseHolder = DatabaseHolder::get(opCtx); auto db = databaseHolder->getDb(opCtx, _ns.db()); if (db) { - Lock::CollectionLock collLock(opCtx->lockState(), _ns.ns(), MODE_IS); + Lock::CollectionLock collLock(opCtx, _ns.ns(), MODE_IS); if (db->getCollection(opCtx, _ns.ns())) { // Collection already created, no more work needs to be done. return Status::OK(); diff --git a/src/mongo/db/s/set_shard_version_command.cpp b/src/mongo/db/s/set_shard_version_command.cpp index d77baa5ec17..e96d5a7603d 100644 --- a/src/mongo/db/s/set_shard_version_command.cpp +++ b/src/mongo/db/s/set_shard_version_command.cpp @@ -229,7 +229,7 @@ public: } boost::optional<Lock::CollectionLock> collLock; - collLock.emplace(opCtx->lockState(), nss.ns(), MODE_IS); + collLock.emplace(opCtx, nss.ns(), MODE_IS); auto* const css = CollectionShardingState::get(opCtx, nss); const ChunkVersion collectionShardVersion = [&] { |