SERVER-39520 Use database IX lock for dropCollection

1 files changed, 11 insertions, 1 deletions

diff --git a/src/mongo/db/catalog_raii.cpp b/src/mongo/db/catalog_raii.cpp
index 20bf489ca71..aee75fed1f8 100644
--- a/src/mongo/db/catalog_raii.cpp
+++ b/src/mongo/db/catalog_raii.cpp
@@ -75,7 +75,17 @@ AutoGetCollection::AutoGetCollection(OperationContext* opCtx,
               modeDB,
               deadline),
       _resolvedNss(resolveNamespaceStringOrUUID(opCtx, nsOrUUID)) {
-    _collLock.emplace(opCtx, _resolvedNss, modeColl, deadline);
+
+    NamespaceString resolvedNssWithLock;
+    do {
+        _collLock.emplace(opCtx, _resolvedNss, modeColl, deadline);
+
+        // We looked up nsOrUUID without a collection lock so it's possible that the
+        // collection is dropped now. Look it up again.
+        resolvedNssWithLock = resolveNamespaceStringOrUUID(opCtx, nsOrUUID);
+    } while (_resolvedNss != resolvedNssWithLock);
+    _resolvedNss = resolvedNssWithLock;
+
     // Wait for a configured amount of time after acquiring locks if the failpoint is enabled
     MONGO_FAIL_POINT_BLOCK(setAutoGetCollectionWait, customWait) {
         const BSONObj& data = customWait.getData();