SERVER-13951 Better scoping for many WUOWs

1 files changed, 9 insertions, 6 deletions

diff --git a/src/mongo/db/catalog/database_holder.cpp b/src/mongo/db/catalog/database_holder.cpp
index fa12613c662..2498c72cd8c 100644
--- a/src/mongo/db/catalog/database_holder.cpp
+++ b/src/mongo/db/catalog/database_holder.cpp
@@ -117,12 +117,15 @@ namespace mongo {
         // this locks _m for defensive checks, so we don't want to be locked right here :
         StorageEngine* storageEngine = getGlobalEnvironment()->getGlobalStorageEngine();
         invariant(storageEngine);
-        DatabaseCatalogEntry* entry = storageEngine->getDatabaseCatalogEntry( txn, dbname );
-        invariant( entry );
-        justCreated = !entry->exists();
-        Database *db = new Database(txn,
-                                    dbname,
-                                    entry );
+        Database *db;
+        {
+            WriteUnitOfWork wunit(txn);
+            DatabaseCatalogEntry* entry = storageEngine->getDatabaseCatalogEntry(txn, dbname);
+            invariant(entry);
+            justCreated = !entry->exists();
+            db = new Database(txn, dbname, entry);
+            wunit.commit();
+        }
 
         {
             SimpleMutex::scoped_lock lk(_m);