SERVER-47972 Increase maxTimeMSForHedgedReads to give shards time to refresh

4 files changed, 10 insertions, 23 deletions

diff --git a/jstests/sharding/hedged_reads.js b/jstests/sharding/hedged_reads.js
index 7108de46908..80a26ae1f30 100644
--- a/jstests/sharding/hedged_reads.js
+++ b/jstests/sharding/hedged_reads.js
@@ -60,7 +60,8 @@ const st = new ShardingTest({
             "failpoint.sdamServerSelectorIgnoreLatencyWindow": tojson({mode: "alwaysOn"}),
             // Force the mongos to send requests to hosts in alphabetical order of host names.
             "failpoint.networkInterfaceSendRequestsToTargetHostsInAlphabeticalOrder":
-                tojson({mode: "alwaysOn"})
+                tojson({mode: "alwaysOn"}),
+            maxTimeMSForHedgedReads: 10
         }
     }],
     shards: 1,
diff --git a/jstests/sharding/hedging_metrics_server_status.js b/jstests/sharding/hedging_metrics_server_status.js
index 6c0622eb278..e42e88da22c 100644
--- a/jstests/sharding/hedging_metrics_server_status.js
+++ b/jstests/sharding/hedging_metrics_server_status.js
@@ -72,7 +72,8 @@ const st = new ShardingTest({
             "failpoint.sdamServerSelectorIgnoreLatencyWindow": tojson({mode: "alwaysOn"}),
             // Force the mongos to send requests to hosts in alphabetical order of host names.
             "failpoint.networkInterfaceSendRequestsToTargetHostsInAlphabeticalOrder":
-                tojson({mode: "alwaysOn"})
+                tojson({mode: "alwaysOn"}),
+            maxTimeMSForHedgedReads: 10
         }
     }],
     shards: 1,
diff --git a/src/mongo/s/hedge_options_util_test.cpp b/src/mongo/s/hedge_options_util_test.cpp
index 3c40194d51f..fcd5f48b6ff 100644
--- a/src/mongo/s/hedge_options_util_test.cpp
+++ b/src/mongo/s/hedge_options_util_test.cpp
@@ -41,6 +41,11 @@ namespace {
 
 class HedgeOptionsUtilTestFixture : public unittest::Test {
 protected:
+    void setUp() {
+        // Reset all the hedging server parameters.
+        setParameters(kDefaultParameters);
+    }
+
     /**
      * Set the given server parameters.
      */
@@ -58,24 +63,6 @@ protected:
     }
 
     /**
-     * Unset the given server parameters by setting them back to the default.
-     */
-    void unsetParameters(const BSONObj& parameters) {
-        const ServerParameter::Map& parameterMap = ServerParameterSet::getGlobal()->getMap();
-        BSONObjIterator parameterIterator(parameters);
-
-        while (parameterIterator.more()) {
-            BSONElement parameter = parameterIterator.next();
-            std::string parameterName = parameter.fieldName();
-            const auto defaultParameter = kDefaultParameters[parameterName];
-            ASSERT_FALSE(defaultParameter.eoo());
-
-            ServerParameter::Map::const_iterator foundParameter = parameterMap.find(parameterName);
-            uassertStatusOK(foundParameter->second->set(defaultParameter));
-        }
-    }
-
-    /**
      * Sets the given server parameters and creates ReadPreferenceSetting from 'rspObj' and extracts
      * HedgeOptions from it. If 'hedge' is true, asserts that the resulting HedgeOptions is not
      * empty, otherwise asserts that it is empty. Resets the server parameters to the defaults
@@ -97,8 +84,6 @@ protected:
         } else {
             ASSERT_FALSE(hedgeOptions.has_value());
         }
-
-        unsetParameters(serverParameters);
     }
 
     static inline const std::string kCollName = "testColl";
diff --git a/src/mongo/s/mongos_server_parameters.idl b/src/mongo/s/mongos_server_parameters.idl
index 956ce09d990..bb659f7cf93 100644
--- a/src/mongo/s/mongos_server_parameters.idl
+++ b/src/mongo/s/mongos_server_parameters.idl
@@ -77,7 +77,7 @@ server_parameters:
     cpp_varname: "gMaxTimeMSForHedgedReads"
     validator:
         gte: 0
-    default: 10
+    default: 150
 
   enableFinerGrainedCatalogCacheRefresh:
     description: >-