summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog/drop_collection.cpp
diff options
context:
space:
mode:
authorTommaso Tocci <tommaso.tocci@mongodb.com>2023-04-05 16:21:13 +0200
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-04-05 18:01:32 +0000
commitf2df94329a61c09fddeb8007b184b900be22b774 (patch)
treeff1fa08d9b396b7bb2c65624e939cc7492217797 /src/mongo/db/catalog/drop_collection.cpp
parentcd5efd2b01aa85b45901e192ad3e0320505e2f8d (diff)
downloadmongo-f2df94329a61c09fddeb8007b184b900be22b774.tar.gz
Revert "SERVER-66715 Add tenant lock"
This reverts commit b9d8a47872050ca5fe6c1b95fcb0534e6e0ebc3d.
Diffstat (limited to 'src/mongo/db/catalog/drop_collection.cpp')
-rw-r--r--src/mongo/db/catalog/drop_collection.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mongo/db/catalog/drop_collection.cpp b/src/mongo/db/catalog/drop_collection.cpp
index a877ea142e0..d91043545a6 100644
--- a/src/mongo/db/catalog/drop_collection.cpp
+++ b/src/mongo/db/catalog/drop_collection.cpp
@@ -369,14 +369,7 @@ Status _dropCollection(OperationContext* opCtx,
try {
return writeConflictRetry(opCtx, "drop", collectionName.ns(), [&] {
- // If a change collection is to be dropped, that is, the change streams are being
- // disabled for a tenant, acquire exclusive tenant lock.
- AutoGetDb autoDb(opCtx,
- collectionName.dbName(),
- MODE_IX /* database lock mode*/,
- boost::make_optional(collectionName.tenantId() &&
- collectionName.isChangeCollection(),
- MODE_X));
+ AutoGetDb autoDb(opCtx, collectionName.dbName(), MODE_IX);
auto db = autoDb.getDb();
if (!db) {
return expectedUUID