SERVER-57205 Always write all three validator variables in the validator setter functions

This fixes a multiversion bug where a data inconsistency is detected because the defaults are not always written depending on version.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/collection_impl.cpp b/src/mongo/db/catalog/collection_impl.cpp
index f8f10d1197f..5cd4440a59b 100644
--- a/src/mongo/db/catalog/collection_impl.cpp
+++ b/src/mongo/db/catalog/collection_impl.cpp
@@ -1507,7 +1507,9 @@ Status CollectionImpl::setValidationLevel(OperationContext* opCtx, ValidationLev
     }
 
     _writeMetadata(opCtx, [&](BSONCollectionCatalogEntry::MetaData& md) {
+        md.options.validator = _validator.validatorDoc;
         md.options.validationLevel = storedValidationLevel;
+        md.options.validationAction = validationActionOrDefault(md.options.validationAction);
     });
 
     return Status::OK();
@@ -1531,6 +1533,8 @@ Status CollectionImpl::setValidationAction(OperationContext* opCtx,
     }
 
     _writeMetadata(opCtx, [&](BSONCollectionCatalogEntry::MetaData& md) {
+        md.options.validator = _validator.validatorDoc;
+        md.options.validationLevel = validationLevelOrDefault(md.options.validationLevel);
         md.options.validationAction = storedValidationAction;
     });