SERVER-47975 Optimize ScopedShardVersionCriticalSection in order to avoid convoy on SSV after a shardVersion change

1 files changed, 10 insertions, 4 deletions

diff --git a/src/mongo/db/s/set_shard_version_command.cpp b/src/mongo/db/s/set_shard_version_command.cpp
index a7c71f7f8b2..ae45d23e844 100644
--- a/src/mongo/db/s/set_shard_version_command.cpp
+++ b/src/mongo/db/s/set_shard_version_command.cpp
@@ -239,10 +239,16 @@ public:
 
         // Step 6
 
-        // Note: The forceRefresh flag controls whether we make sure to do our
-        // own refresh or if we're okay with joining another thread
-        const auto status = onShardVersionMismatchNoExcept(
-            opCtx, nss, requestedVersion, forceRefresh /*forceRefreshFromThisThread*/);
+        // Note: The forceRefresh flag controls whether we make sure to do our own refresh or if
+        // we're okay with joining another thread
+        const auto status = [&] {
+            try {
+                forceShardFilteringMetadataRefresh(opCtx, nss, forceRefresh);
+                return Status::OK();
+            } catch (const DBException& ex) {
+                return ex.toStatus();
+            }
+        }();
 
         {
             // Avoid using AutoGetCollection() as it returns the InvalidViewDefinition error code