SERVER-35715 Remove nopreallocj and smallfiles options from tests

6 files changed, 2 insertions, 35 deletions

diff --git a/src/mongo/dbtests/framework_options.cpp b/src/mongo/dbtests/framework_options.cpp
index 0d2a4768213..192760718d4 100644
--- a/src/mongo/dbtests/framework_options.cpp
+++ b/src/mongo/dbtests/framework_options.cpp
@@ -79,11 +79,6 @@ Status addTestFrameworkOptions(moe::OptionSection* options) {
 
     options->addOptionChaining("list", "list,l", moe::Switch, "list available test suites");
 
-    options->addOptionChaining("bigfiles",
-                               "bigfiles",
-                               moe::Switch,
-                               "use big datafiles instead of smallfiles which is the default");
-
     options->addOptionChaining(
         "filter", "filter,f", moe::String, "string substring filter on test name");
 
@@ -110,11 +105,6 @@ Status addTestFrameworkOptions(moe::OptionSection* options) {
         .hidden()
         .positional(1, -1);
 
-    options
-        ->addOptionChaining("nopreallocj", "nopreallocj", moe::Switch, "disable journal prealloc")
-        .hidden();
-
-
     return Status::OK();
 }
 
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index 94e5e8b18b3..cf4938d6fd6 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -2191,7 +2191,6 @@ var ReplSetTest = function(opts) {
             keyFile: this.keyFile,
             port: _useBridge ? _unbridgedPorts[n] : this.ports[n],
             noprealloc: "",
-            smallfiles: "",
             replSet: this.useSeedList ? this.getURL() : this.name,
             dbpath: "$set-$node"
         };
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js
index 2939cbc4f51..2506259d984 100644
--- a/src/mongo/shell/servers.js
+++ b/src/mongo/shell/servers.js
@@ -238,7 +238,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
         noReplSet: true,
         forgetPort: true,
         arbiter: true,
-        noJournalPrealloc: true,
         noJournal: true,
         binVersion: true,
         waitForConnect: true,
@@ -362,11 +361,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
                 if (!o.binVersion)
                     return true;
 
-                // Version 1.x options
-                if (o.binVersion.startsWith("1.")) {
-                    return ["nopreallocj"].indexOf(option) < 0;
-                }
-
                 return true;
             };
 
@@ -580,7 +574,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
      *     useLogFiles {boolean}: use with logFile option.
      *     logFile {string}: path to the log file. If not specified and useLogFiles
      *       is true, automatically creates a log file inside dbpath.
-     *     noJournalPrealloc {boolean}
      *     noJournal {boolean}
      *     keyFile
      *     replSet
@@ -609,9 +602,6 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro
             opts.logpath = opts.logFile;
         }
 
-        if (jsTestOptions().noJournalPrealloc || opts.noJournalPrealloc)
-            opts.nopreallocj = "";
-
         if ((jsTestOptions().noJournal || opts.noJournal) && !('journal' in opts) &&
             !('configsvr' in opts)) {
             opts.nojournal = "";
diff --git a/src/mongo/shell/servers_misc.js b/src/mongo/shell/servers_misc.js
index 89a07564b66..a83a9e507b4 100644
--- a/src/mongo/shell/servers_misc.js
+++ b/src/mongo/shell/servers_misc.js
@@ -14,13 +14,7 @@ ToolTest = function(name, extraOptions) {
 ToolTest.prototype.startDB = function(coll) {
     assert(!this.m, "db already running");
 
-    var options = {
-        port: this.port,
-        dbpath: this.dbpath,
-        noprealloc: "",
-        smallfiles: "",
-        bind_ip: "127.0.0.1"
-    };
+    var options = {port: this.port, dbpath: this.dbpath, noprealloc: "", bind_ip: "127.0.0.1"};
 
     Object.extend(options, this.options);
 
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 864c23b510c..9ca112c48a2 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -12,7 +12,6 @@
  *     name {string}: name for this test
  *     verbose {number}: the verbosity for the mongos
  *     chunkSize {number}: the chunk size to use as configuration for the cluster
- *     nopreallocj {boolean|number}:
  *
  *     mongos {number|Object|Array.<Object>}: number of mongos or mongos
  *       configuration object(s)(*). @see MongoRunner.runMongos
@@ -54,7 +53,6 @@
  *          options take precedence.
  *
  *     other: {
- *       nopreallocj: same as above
  *       rs: same as above
  *       chunkSize: same as above
  *       keyFile {string}: the location of the keyFile
@@ -1063,7 +1061,7 @@ var ShardingTest = function(params) {
 
     // Allow specifying mixed-type options like this:
     // { mongos : [ { noprealloc : "" } ],
-    //   config : [ { smallfiles : "" } ],
+    //   config : [ { nojournal : "" } ],
     //   shards : { rs : true, d : true } }
     if (Array.isArray(numShards)) {
         for (var i = 0; i < numShards.length; i++) {
@@ -1149,7 +1147,6 @@ var ShardingTest = function(params) {
 
             var rsDefaults = {
                 useHostname: otherParams.useHostname,
-                noJournalPrealloc: otherParams.nopreallocj,
                 oplogSize: 16,
                 shardsvr: '',
                 pathOpts: Object.merge(pathOpts, {shard: i}),
@@ -1238,7 +1235,6 @@ var ShardingTest = function(params) {
         } else {
             var options = {
                 useHostname: otherParams.useHostname,
-                noJournalPrealloc: otherParams.nopreallocj,
                 pathOpts: Object.merge(pathOpts, {shard: i}),
                 dbpath: "$testName$shard",
                 shardsvr: '',
@@ -1347,7 +1343,6 @@ var ShardingTest = function(params) {
         // Ensure that journaling is always enabled for config servers.
         journal: "",
         configsvr: "",
-        noJournalPrealloc: otherParams.nopreallocj,
         storageEngine: "wiredTiger",
     };
 
diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js
index ab1c7120735..dafdac4101d 100644
--- a/src/mongo/shell/utils.js
+++ b/src/mongo/shell/utils.js
@@ -259,7 +259,6 @@ jsTestOptions = function() {
             wiredTigerCollectionConfigString: TestData.wiredTigerCollectionConfigString,
             wiredTigerIndexConfigString: TestData.wiredTigerIndexConfigString,
             noJournal: TestData.noJournal,
-            noJournalPrealloc: TestData.noJournalPrealloc,
             auth: TestData.auth,
             // Note: keyFile is also used as a flag to indicate cluster auth is turned on, set it
             // to a truthy value if you'd like to do cluster auth, even if it's not keyFile auth.