SERVER-69180 Split and Merge commands need to refresh filtering metadata before checking preconditions

2 files changed, 3 insertions, 0 deletions

diff --git a/src/mongo/db/s/shardsvr_merge_chunks_command.cpp b/src/mongo/db/s/shardsvr_merge_chunks_command.cpp
index 69a4610a838..22f20b9135b 100644
--- a/src/mongo/db/s/shardsvr_merge_chunks_command.cpp
+++ b/src/mongo/db/s/shardsvr_merge_chunks_command.cpp
@@ -95,6 +95,7 @@ void mergeChunks(OperationContext* opCtx,
 
     // Check that the preconditions for merge chunks are met and throw StaleShardVersion otherwise.
     const auto metadataBeforeMerge = [&]() {
+        onShardVersionMismatch(opCtx, nss, boost::none);
         OperationShardingState::unsetShardRoleForLegacyDDLOperationsSentWithShardVersionIfNeeded(
             opCtx, nss);
         const auto metadata = checkCollectionIdentity(opCtx, nss, expectedEpoch, expectedTimestamp);
diff --git a/src/mongo/db/s/shardsvr_split_chunk_command.cpp b/src/mongo/db/s/shardsvr_split_chunk_command.cpp
index bdcae8af9ad..3d11f8990fc 100644
--- a/src/mongo/db/s/shardsvr_split_chunk_command.cpp
+++ b/src/mongo/db/s/shardsvr_split_chunk_command.cpp
@@ -40,6 +40,7 @@
 #include "mongo/db/s/chunk_operation_precondition_checks.h"
 #include "mongo/db/s/collection_sharding_runtime.h"
 #include "mongo/db/s/operation_sharding_state.h"
+#include "mongo/db/s/shard_filtering_metadata_refresh.h"
 #include "mongo/db/s/sharding_state.h"
 #include "mongo/db/s/split_chunk.h"
 #include "mongo/logv2/log.h"
@@ -159,6 +160,7 @@ public:
         // Check that the preconditions for split chunk are met and throw StaleShardVersion
         // otherwise.
         {
+            onShardVersionMismatch(opCtx, nss, boost::none);
             OperationShardingState::
                 unsetShardRoleForLegacyDDLOperationsSentWithShardVersionIfNeeded(opCtx, nss);
             const auto metadata = checkCollectionIdentity(