SERVER-26777 Improve logging around chunk refresh

Unifies the logging messages between mongos and mongod and adds timing
information.

1 files changed, 9 insertions, 2 deletions

diff --git a/src/mongo/s/catalog/type_collection.cpp b/src/mongo/s/catalog/type_collection.cpp
index 5c94eb3fc69..aed93093462 100644
--- a/src/mongo/s/catalog/type_collection.cpp
+++ b/src/mongo/s/catalog/type_collection.cpp
@@ -105,8 +105,15 @@ StatusWith<CollectionType> CollectionType::fromBSON(const BSONObj& source) {
             }
 
             coll._keyPattern = KeyPattern(obj.getOwned());
-        } else if ((status == ErrorCodes::NoSuchKey) && coll.getDropped()) {
-            // Sharding key can be missing if the collection is dropped
+        } else if (status == ErrorCodes::NoSuchKey) {
+            // Sharding key can only be missing if the collection is dropped
+            if (!coll.getDropped()) {
+                return {status.code(),
+                        str::stream() << "Shard key for collection " << coll._fullNs->ns()
+                                      << " is missing, but the collection is not marked as "
+                                         "dropped. This is an indication of corrupted sharding "
+                                         "metadata."};
+            }
         } else {
             return status;
         }