SERVER-25892 Hold global lock while listing databases

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/commands/list_databases.cpp b/src/mongo/db/commands/list_databases.cpp
index d73851d1bde..f97988641fa 100644
--- a/src/mongo/db/commands/list_databases.cpp
+++ b/src/mongo/db/commands/list_databases.cpp
@@ -33,6 +33,7 @@
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/client.h"
 #include "mongo/db/commands.h"
+#include "mongo/db/concurrency/d_concurrency.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/storage/storage_engine.h"
@@ -82,7 +83,11 @@ public:
              BSONObjBuilder& result) {
         vector<string> dbNames;
         StorageEngine* storageEngine = getGlobalServiceContext()->getGlobalStorageEngine();
-        storageEngine->listDatabases(&dbNames);
+        {
+            ScopedTransaction transaction(txn, MODE_IS);
+            Lock::GlobalLock lk(txn->lockState(), MODE_IS, UINT_MAX);
+            storageEngine->listDatabases(&dbNames);
+        }
 
         vector<BSONObj> dbInfos;