SERVER-48088 Set minSnapshotHistoryWindowInSeconds in tests

sharding_non_transaction_snapshot_read.js had only set the parameter on config
servers, not the shard servers.

2 files changed, 16 insertions, 4 deletions

diff --git a/jstests/replsets/non_transaction_snapshot_reads.js b/jstests/replsets/non_transaction_snapshot_reads.js
index b3dd5db621c..23b7fd7cc6f 100644
--- a/jstests/replsets/non_transaction_snapshot_reads.js
+++ b/jstests/replsets/non_transaction_snapshot_reads.js
@@ -18,6 +18,12 @@ const options = {
 const replSet = new ReplSetTest({nodes: 3, nodeOptions: options});
 replSet.startSet();
 replSet.initiateWithHighElectionTimeout();
+let primaryAdmin = replSet.getPrimary().getDB("admin");
+assert.eq(assert
+              .commandWorked(
+                  primaryAdmin.runCommand({getParameter: 1, minSnapshotHistoryWindowInSeconds: 1}))
+              .minSnapshotHistoryWindowInSeconds,
+          600);
 const primaryDB = replSet.getPrimary().getDB('test');
 const secondaryDB = replSet.getSecondary().getDB('test');
 snapshotReadsTest({
diff --git a/jstests/sharding/sharding_non_transaction_snapshot_read.js b/jstests/sharding/sharding_non_transaction_snapshot_read.js
index 127ec31d417..1497eaf000b 100644
--- a/jstests/sharding/sharding_non_transaction_snapshot_read.js
+++ b/jstests/sharding/sharding_non_transaction_snapshot_read.js
@@ -14,7 +14,7 @@
 load("jstests/libs/global_snapshot_reads_util.js");
 load("jstests/sharding/libs/sharded_transactions_helpers.js");
 
-const configOptions = {
+const nodeOptions = {
     // Set a large snapshot window of 10 minutes for the test.
     setParameter: {minSnapshotHistoryWindowInSeconds: 600}
 };
@@ -37,7 +37,7 @@ let shardingScenarios = {
                 mongos: 1,
                 config: 1,
                 shards: {rs0: {nodes: 2}},
-                other: {configOptions: configOptions}
+                other: {configOptions: nodeOptions, rsOptions: nodeOptions}
             });
             setUpAllScenarios(st);
             return st;
@@ -54,7 +54,7 @@ let shardingScenarios = {
                 },
                 mongos: 1,
                 config: 1,
-                other: {configOptions: configOptions}
+                other: {configOptions: nodeOptions, rsOptions: nodeOptions}
             });
             setUpAllScenarios(st);
             const mongos = st.s0;
@@ -92,7 +92,7 @@ let shardingScenarios = {
                 },
                 mongos: 1,
                 config: 1,
-                other: {configOptions: configOptions}
+                other: {configOptions: nodeOptions, rsOptions: nodeOptions}
             });
             setUpAllScenarios(st);
             const mongos = st.s0;
@@ -120,6 +120,12 @@ for (let [scenarioName, scenario] of Object.entries(shardingScenarios)) {
     scenario.compatibleCollections.forEach(function(collName) {
         jsTestLog(`Run scenario ${scenarioName} with collection ${collName}`);
         let st = scenario.setUp();
+        let primaryAdmin = st.rs0.getPrimary().getDB("admin");
+        assert.eq(assert
+                      .commandWorked(primaryAdmin.runCommand(
+                          {getParameter: 1, minSnapshotHistoryWindowInSeconds: 1}))
+                      .minSnapshotHistoryWindowInSeconds,
+                  600);
 
         function awaitCommittedFn() {
             for (let i = 0; st['rs' + i] !== undefined; i++) {