SERVER-51603 log a message when validation ends in an exception

(cherry picked from commit 610f866d059f82e01e87af35e3035118bcdbdef8)

1 files changed, 10 insertions, 14 deletions

diff --git a/src/mongo/db/catalog/collection_validation.cpp b/src/mongo/db/catalog/collection_validation.cpp
index 4a27a50b04c..f337c3a1359 100644
--- a/src/mongo/db/catalog/collection_validation.cpp
+++ b/src/mongo/db/catalog/collection_validation.cpp
@@ -599,26 +599,22 @@ Status validate(OperationContext* opCtx,
                       "corruption found",
                       "namespace"_attr = validateState.nss(),
                       "uuid"_attr = uuidString);
-
-    } catch (ExceptionFor<ErrorCodes::CursorNotFound>&) {
-        invariant(background);
-        string warning = str::stream()
-            << "Collection validation with {background: true} validates"
-            << " the latest checkpoint (data in a snapshot written to disk in a consistent"
-            << " way across all data files). During this validation, some tables have not yet been"
-            << " checkpointed.";
-        results->warnings.push_back(warning);
-
-        // Nothing to validate, so it must be valid.
-        results->valid = true;
-        return Status::OK();
-    } catch (DBException& e) {
+    } catch (const DBException& e) {
         if (ErrorCodes::isInterruption(e.code())) {
+            LOGV2_OPTIONS(5160301,
+                          {LogComponent::kIndex},
+                          "Validation interrupted",
+                          "namespace"_attr = validateState.nss());
             return e.toStatus();
         }
         string err = str::stream() << "exception during collection validation: " << e.toString();
         results->errors.push_back(err);
         results->valid = false;
+        LOGV2_OPTIONS(5160302,
+                      {LogComponent::kIndex},
+                      "Validation failed due to exception",
+                      "namespace"_attr = validateState.nss(),
+                      "error"_attr = e.toString());
     }
 
     return Status::OK();