SERVER-22322 Add namespaces to listIndexes NamespaceNotFound messages

(cherry picked from commit 9c23775905ef7a9612304c677114cb5f921bd54e)

1 files changed, 6 insertions, 4 deletions

diff --git a/src/mongo/db/commands/list_indexes.cpp b/src/mongo/db/commands/list_indexes.cpp
index 53e563ab7bd..1a581074d55 100644
--- a/src/mongo/db/commands/list_indexes.cpp
+++ b/src/mongo/db/commands/list_indexes.cpp
@@ -134,14 +134,16 @@ public:
 
         AutoGetCollectionForRead autoColl(txn, ns);
         if (!autoColl.getDb()) {
-            return appendCommandStatus(result,
-                                       Status(ErrorCodes::NamespaceNotFound, "no database"));
+            return appendCommandStatus(
+                result,
+                Status(ErrorCodes::NamespaceNotFound, "Database " + ns.db() + " doesn't exist"));
         }
 
         const Collection* collection = autoColl.getCollection();
         if (!collection) {
-            return appendCommandStatus(result,
-                                       Status(ErrorCodes::NamespaceNotFound, "no collection"));
+            return appendCommandStatus(
+                result,
+                Status(ErrorCodes::NamespaceNotFound, "Collection " + ns.ns() + " doesn't exist"));
         }
 
         const CollectionCatalogEntry* cce = collection->getCatalogEntry();