1 files changed, 18 insertions, 0 deletions
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index e6fb65ecc12..3f613f90f95 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -999,6 +999,14 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                         .length > 0);
         }
 
+        function argArrayContainsSetParameterValue(value) {
+            assert(value.endsWith("="),
+                   "Expected value argument to be of the form <parameterName>=");
+            return argArray.some(function(el) {
+                return typeof el === "string" && el.startsWith(value);
+            });
+        }
+
         // programName includes the version, e.g., mongod-3.2.
         // baseProgramName is the program name without any version information, e.g., mongod.
         let programName = argArray[0];
@@ -1074,6 +1082,16 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                     }
                 }
 
+                // New mongod-specific options in 3.6.x
+                if (!programMajorMinorVersion || programMajorMinorVersion >= 360) {
+                    if ((jsTest.options().setParameters === undefined ||
+                         jsTest.options().setParameters['minNumChunksForSessionsCollection'] ===
+                             undefined) &&
+                        !argArrayContainsSetParameterValue('minNumChunksForSessionsCollection=')) {
+                        argArray.push(...['--setParameter', "minNumChunksForSessionsCollection=1"]);
+                    }
+                }
+
                 // TODO: Make this unconditional in 3.8.
                 if (!programMajorMinorVersion || programMajorMinorVersion > 304) {
                     let hasParam = false;