SERVER-33272 Proactively close newly empty databases

1 files changed, 8 insertions, 0 deletions

diff --git a/src/mongo/dbtests/plan_executor_invalidation_test.cpp b/src/mongo/dbtests/plan_executor_invalidation_test.cpp
index 61eedeab72f..7a62f40afb8 100644
--- a/src/mongo/dbtests/plan_executor_invalidation_test.cpp
+++ b/src/mongo/dbtests/plan_executor_invalidation_test.cpp
@@ -59,6 +59,10 @@ static const NamespaceString nss("unittests.PlanExecutorInvalidationTest");
 class PlanExecutorInvalidationTest : public unittest::Test {
 public:
     PlanExecutorInvalidationTest() : _client(&_opCtx) {
+        // Create an additional collection to prevent the database from closing when the other
+        // collection is dropped.
+        ASSERT_TRUE(_client.createCollection("unittests.PlanExecutorInvalidationTestUnused"));
+
         _ctx.reset(new dbtests::WriteContextForTests(&_opCtx, nss.ns()));
         _client.dropCollection(nss.ns());
 
@@ -67,6 +71,10 @@ public:
         }
     }
 
+    ~PlanExecutorInvalidationTest() {
+        _client.dropCollection("unittests.PlanExecutorInvalidationTestUnused");
+    }
+
     /**
      * Return a plan executor that is going over the collection in nss.ns().
      */