SERVER-34363: move reload shard registry in addShard command from ON_BLOCK_EXIT

1 files changed, 8 insertions, 9 deletions

diff --git a/src/mongo/s/commands/cluster_add_shard_cmd.cpp b/src/mongo/s/commands/cluster_add_shard_cmd.cpp
index 8a3abf08b81..a762a291860 100644
--- a/src/mongo/s/commands/cluster_add_shard_cmd.cpp
+++ b/src/mongo/s/commands/cluster_add_shard_cmd.cpp
@@ -77,22 +77,21 @@ public:
              BSONObjBuilder& result) override {
         auto parsedRequest = uassertStatusOK(AddShardRequest::parseFromMongosCommand(cmdObj));
 
-        // Force a reload of this node's shard list cache at the end of this command.
-        ON_BLOCK_EXIT([opCtx] {
-            if (!Grid::get(opCtx)->shardRegistry()->reload(opCtx)) {
-                Grid::get(opCtx)->shardRegistry()->reload(opCtx);
-            }
-        });
-
         auto configShard = Grid::get(opCtx)->shardRegistry()->getConfigShard();
-        auto cmdResponse = uassertStatusOK(configShard->runCommandWithFixedRetryAttempts(
+
+        // Force a reload of this node's shard list cache at the end of this command.
+        auto cmdResponseWithStatus = configShard->runCommandWithFixedRetryAttempts(
             opCtx,
             kPrimaryOnlyReadPreference,
             "admin",
             CommandHelpers::appendMajorityWriteConcern(CommandHelpers::appendPassthroughFields(
                 cmdObj, parsedRequest.toCommandForConfig())),
-            Shard::RetryPolicy::kIdempotent));
+            Shard::RetryPolicy::kIdempotent);
 
+        if (!Grid::get(opCtx)->shardRegistry()->reload(opCtx)) {
+            Grid::get(opCtx)->shardRegistry()->reload(opCtx);
+        }
+        auto cmdResponse = uassertStatusOK(cmdResponseWithStatus);
         CommandHelpers::filterCommandReplyForPassthrough(cmdResponse.response, &result);
         return true;
     }