diff options
author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-08-22 21:11:29 -0400 |
---|---|---|
committer | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-08-22 22:13:45 -0400 |
commit | b6b81f34516ba7b1472cb1dd319da8785f24ae58 (patch) | |
tree | b769955851c46b08aa3145e6aeaab27fff706ef3 /src/mongo/dbtests/rollbacktests.cpp | |
parent | d743246d3c0e35c21b4f1d954bc138df60c47a5a (diff) | |
download | mongo-b6b81f34516ba7b1472cb1dd319da8785f24ae58.tar.gz |
SERVER-33272 Proactively close newly empty databases
Diffstat (limited to 'src/mongo/dbtests/rollbacktests.cpp')
-rw-r--r-- | src/mongo/dbtests/rollbacktests.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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())); |