From b6b81f34516ba7b1472cb1dd319da8785f24ae58 Mon Sep 17 00:00:00 2001 From: Gregory Wlodarek Date: Thu, 22 Aug 2019 21:11:29 -0400 Subject: SERVER-33272 Proactively close newly empty databases --- src/mongo/dbtests/rollbacktests.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/mongo/dbtests/rollbacktests.cpp') diff --git a/src/mongo/dbtests/rollbacktests.cpp b/src/mongo/dbtests/rollbacktests.cpp index fd48e6f46a3..d5e69fce2f3 100644 --- a/src/mongo/dbtests/rollbacktests.cpp +++ b/src/mongo/dbtests/rollbacktests.cpp @@ -53,7 +53,7 @@ namespace { const auto kIndexVersion = IndexDescriptor::IndexVersion::kV2; void dropDatabase(OperationContext* opCtx, const NamespaceString& nss) { - Lock::GlobalWrite globalWriteLock(opCtx); + AutoGetDb autoDB(opCtx, nss.db(), MODE_X); auto databaseHolder = DatabaseHolder::get(opCtx); auto db = databaseHolder->getDb(opCtx, nss.db()); @@ -394,6 +394,12 @@ public: assertGet(CollectionOptions::parse(BSONObj(), CollectionOptions::parseForCommand)); ASSERT_OK(ctx.db()->userCreateNS(&opCtx, nss, collectionOptions, defaultIndexes)); insertRecord(&opCtx, nss, oldDoc); + + // Create an additional collection to prevent the database from closing when the other + // collection is dropped. + NamespaceString unusedCollectionNSS("unittests.rollback_replace_collection_unused"); + ASSERT_OK(ctx.db()->userCreateNS( + &opCtx, unusedCollectionNSS, collectionOptions, defaultIndexes)); uow.commit(); } ASSERT(collectionExists(&opCtx, &ctx, nss.ns())); -- cgit v1.2.1