SERVER-57022 The CollectionShardingRuntime should be updated when there is an update of the metadata format

(cherry picked from commit 6edab4953a0186e0d062d444682f9f4135a0a4b8)

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/db/s/metadata_manager.cpp b/src/mongo/db/s/metadata_manager.cpp
index 4a857f4952c..4376b32a2c6 100644
--- a/src/mongo/db/s/metadata_manager.cpp
+++ b/src/mongo/db/s/metadata_manager.cpp
@@ -178,8 +178,13 @@ void MetadataManager::setFilteringMetadata(CollectionMetadata remoteMetadata) {
     invariant(_metadata.back()->metadata);
     const auto& activeMetadata = _metadata.back()->metadata.get();
 
-    // We already have the same or newer version
-    if (remoteMetadata.getCollVersion().isOlderOrEqualThan(activeMetadata.getCollVersion())) {
+    const auto remoteCollVersion = remoteMetadata.getCollVersion();
+    const auto activeCollVersion = activeMetadata.getCollVersion();
+    // Do nothing if the remote version is older than the current active one,
+    // or it is the same and there was not an update on the metadata format.
+    if (remoteCollVersion.isOlderThan(activeCollVersion) ||
+        (remoteCollVersion == activeCollVersion &&
+         remoteCollVersion.getTimestamp() == activeCollVersion.getTimestamp())) {
         LOGV2_DEBUG(21984,
                     1,
                     "Ignoring incoming metadata update {activeMetadata} for {namespace} because "