summaryrefslogtreecommitdiff
path: root/jstests/multiVersion
diff options
context:
space:
mode:
Diffstat (limited to 'jstests/multiVersion')
-rw-r--r--jstests/multiVersion/downgrade_replset.js8
-rw-r--r--jstests/multiVersion/dumprestore.js3
-rw-r--r--jstests/multiVersion/dumprestore_sharded.js6
-rw-r--r--jstests/multiVersion/geo_2dsphere_v2_to_v3.js17
-rw-r--r--jstests/multiVersion/invalid_key_pattern_upgrade.js1
-rw-r--r--jstests/multiVersion/libs/dumprestore_helpers.js27
-rw-r--r--jstests/multiVersion/libs/multi_cluster.js4
-rw-r--r--jstests/multiVersion/minor_version_downgrade_replset.js7
-rw-r--r--jstests/multiVersion/mmapv1_overrides_default_storage_engine.js7
-rw-r--r--jstests/multiVersion/multikey_paths_downgrade.js2
-rw-r--r--jstests/multiVersion/partial_index_upgrade.js1
-rw-r--r--jstests/multiVersion/readmode_compatibility.js6
-rw-r--r--jstests/multiVersion/server-23299-2.js9
-rw-r--r--jstests/multiVersion/wt_index_option_defaults_replset.js2
14 files changed, 28 insertions, 72 deletions
diff --git a/jstests/multiVersion/downgrade_replset.js b/jstests/multiVersion/downgrade_replset.js
index 8ee5e0986ba..abffcf3875e 100644
--- a/jstests/multiVersion/downgrade_replset.js
+++ b/jstests/multiVersion/downgrade_replset.js
@@ -1,8 +1,5 @@
// Test the downgrade of a replica set from latest version
// to last-stable version succeeds, while reads and writes continue.
-//
-// @tags: [requires_mmapv1]
-// Note - downgrade from 3.3 to 3.2 is not possible for wiredTiger (SERVER-19703 & SERVER-23960).
load('./jstests/multiVersion/libs/multi_rs.js');
load('./jstests/libs/test_background_ops.js');
@@ -17,8 +14,7 @@ var nodes = {
n3: {binVersion: newVersion}
};
-var storageEngine = "mmapv1";
-var rst = new ReplSetTest({name: name, nodes: nodes, nodeOptions: {storageEngine: storageEngine}});
+var rst = new ReplSetTest({name: name, nodes: nodes, nodeOptions: {storageEngine: 'mmapv1'}});
rst.startSet();
var replSetConfig = rst.getReplSetConfig();
replSetConfig.protocolVersion = 0;
@@ -45,7 +41,7 @@ jsTest.log("Starting parallel operations during downgrade..");
var joinFindInsert = startParallelOps(primary, insertDocuments, [rst.getURL(), coll]);
jsTest.log("Downgrading replica set..");
-rst.upgradeSet({binVersion: oldVersion, storageEngine: storageEngine});
+rst.upgradeSet({binVersion: oldVersion});
jsTest.log("Downgrade complete.");
primary = rst.getPrimary();
diff --git a/jstests/multiVersion/dumprestore.js b/jstests/multiVersion/dumprestore.js
index db82b7abaa6..8d692e4abb6 100644
--- a/jstests/multiVersion/dumprestore.js
+++ b/jstests/multiVersion/dumprestore.js
@@ -18,7 +18,6 @@ var singleNodeTests = {
'dumpDir': [dumpDir],
'testDbpath': [testDbpath],
'dumpType': ["mongod"],
- 'restoreType': ["mongod"],
- 'storageEngine': [jsTest.options().storageEngine || "wiredTiger"]
+ 'restoreType': ["mongod"]
};
runAllDumpRestoreTests(singleNodeTests);
diff --git a/jstests/multiVersion/dumprestore_sharded.js b/jstests/multiVersion/dumprestore_sharded.js
index 6e5658e61fc..8f3c61d3f2d 100644
--- a/jstests/multiVersion/dumprestore_sharded.js
+++ b/jstests/multiVersion/dumprestore_sharded.js
@@ -16,8 +16,7 @@ var shardedDumpTests = {
'dumpDir': [dumpDir],
'testDbpath': [testDbpath],
'dumpType': ["mongos"],
- 'restoreType': ["mongod"],
- 'storageEngine': [jsTest.options().storageEngine || "wiredTiger"]
+ 'restoreType': ["mongod"]
};
runAllDumpRestoreTests(shardedDumpTests);
@@ -30,7 +29,6 @@ var shardedRestoreTests = {
'dumpDir': [dumpDir],
'testDbpath': [testDbpath],
'dumpType': ["mongod"],
- 'restoreType': ["mongos"],
- 'storageEngine': [jsTest.options().storageEngine || "wiredTiger"]
+ 'restoreType': ["mongos"]
};
runAllDumpRestoreTests(shardedRestoreTests);
diff --git a/jstests/multiVersion/geo_2dsphere_v2_to_v3.js b/jstests/multiVersion/geo_2dsphere_v2_to_v3.js
index 624ec1997db..c00612a492f 100644
--- a/jstests/multiVersion/geo_2dsphere_v2_to_v3.js
+++ b/jstests/multiVersion/geo_2dsphere_v2_to_v3.js
@@ -1,7 +1,5 @@
// Tests upgrade/downgrade between 2dsphere index versions 2 and 3
-// @tags: [requires_mmapv1]
-
function generatePoint() {
var longitude = Math.random() * 10 - 5;
var latitude = Math.random() * 10 - 5;
@@ -51,9 +49,7 @@ function get2dsphereIndexVersion(coll) {
var nearQuery = {geometry: {$near: {$geometry: {type: "Point", coordinates: [0, 0]}}}};
-// SERVER-25129 - Only runs in mmapv1
-var storageEngine = "mmapv1";
-var mongod = MongoRunner.runMongod({binVersion: "3.0", storageEngine: storageEngine});
+var mongod = MongoRunner.runMongod({binVersion: "3.0"});
var coll = getCollection(mongod);
var res = coll.insert(generatePoints(10));
res = coll.insert(generatePolygons(10));
@@ -64,8 +60,7 @@ assert.eq(res.itcount(), 20);
// Version 2 index should still work fine in latest
MongoRunner.stopMongod(mongod);
-mongod =
- MongoRunner.runMongod({binVersion: "latest", restart: mongod, storageEngine: storageEngine});
+mongod = MongoRunner.runMongod({binVersion: "latest", restart: mongod});
coll = getCollection(mongod);
assert.eq(2, get2dsphereIndexVersion(coll));
res = coll.find(nearQuery);
@@ -80,20 +75,18 @@ assert.eq(res.itcount(), 20);
// downgrading shouldn't be able to startup because of assertion error
MongoRunner.stopMongod(mongod);
-var failed_mongod =
- MongoRunner.runMongod({binVersion: "3.0", restart: mongod, storageEngine: storageEngine});
+var failed_mongod = MongoRunner.runMongod({binVersion: "3.0", restart: mongod});
assert.eq(failed_mongod, null);
// upgrade, reindex, then downgrade to fix
-mongod =
- MongoRunner.runMongod({binVersion: "latest", restart: mongod, storageEngine: storageEngine});
+mongod = MongoRunner.runMongod({binVersion: "latest", restart: mongod});
coll = getCollection(mongod);
assert.eq(3, get2dsphereIndexVersion(coll));
res = coll.dropIndex({geometry: "2dsphere"});
res = coll.createIndex({geometry: "2dsphere"}, {"2dsphereIndexVersion": 2});
assert.eq(2, get2dsphereIndexVersion(coll));
MongoRunner.stopMongod(mongod);
-mongod = MongoRunner.runMongod({binVersion: "3.0", restart: mongod, storageEngine: storageEngine});
+mongod = MongoRunner.runMongod({binVersion: "3.0", restart: mongod});
assert.neq(mongod, null);
coll = getCollection(mongod);
assert.eq(2, get2dsphereIndexVersion(coll));
diff --git a/jstests/multiVersion/invalid_key_pattern_upgrade.js b/jstests/multiVersion/invalid_key_pattern_upgrade.js
index 16fffdfb136..a3098e34c0a 100644
--- a/jstests/multiVersion/invalid_key_pattern_upgrade.js
+++ b/jstests/multiVersion/invalid_key_pattern_upgrade.js
@@ -25,7 +25,6 @@
var defaultOptions = {
dbpath: dbpath,
noCleanData: true,
- storageEngine: jsTest.options().storageEngine
};
// Start the old version.
diff --git a/jstests/multiVersion/libs/dumprestore_helpers.js b/jstests/multiVersion/libs/dumprestore_helpers.js
index 3709a0414c2..4b2eda47b8a 100644
--- a/jstests/multiVersion/libs/dumprestore_helpers.js
+++ b/jstests/multiVersion/libs/dumprestore_helpers.js
@@ -14,8 +14,7 @@ load('./jstests/multiVersion/libs/verify_collection_data.js');
// 'dumpDir' : dumpDir,
// 'testDbpath' : testDbpath,
// 'dumpType' : "mongos",
-// 'restoreType' : "mongod", // "mongos" also supported
-// 'storageEngine': [ "mmapv1" ]
+// 'restoreType' : "mongod" // "mongos" also supported
// }
//
// The first four fields are which versions of the various binaries to use in the test.
@@ -38,8 +37,7 @@ function multiVersionDumpRestoreTest(configObj) {
'dumpDir',
'testDbpath',
'dumpType',
- 'restoreType',
- 'storageEngine'
+ 'restoreType'
];
var i;
@@ -55,10 +53,7 @@ function multiVersionDumpRestoreTest(configObj) {
var shardingTestConfig = {
name: testBaseName + "_sharded_source",
mongos: [{binVersion: configObj.serverSourceVersion}],
- shards: [{
- binVersion: configObj.serverSourceVersion,
- storageEngine: configObj.storageEngine
- }],
+ shards: [{binVersion: configObj.serverSourceVersion}],
config: [{binVersion: configObj.serverSourceVersion}],
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
@@ -66,11 +61,8 @@ function multiVersionDumpRestoreTest(configObj) {
var shardingTest = new ShardingTest(shardingTestConfig);
var serverSource = shardingTest.s;
} else {
- var serverSource = MongoRunner.runMongod({
- binVersion: configObj.serverSourceVersion,
- dbpath: configObj.testDbpath,
- storageEngine: configObj.storageEngine
- });
+ var serverSource = MongoRunner.runMongod(
+ {binVersion: configObj.serverSourceVersion, dbpath: configObj.testDbpath});
}
var sourceDB = serverSource.getDB(testBaseName);
@@ -110,8 +102,7 @@ function multiVersionDumpRestoreTest(configObj) {
// Restore using the specified version of mongorestore
if (configObj.restoreType === "mongod") {
- var serverDest = MongoRunner.runMongod(
- {binVersion: configObj.serverDestVersion, storageEngine: configObj.storageEngine});
+ var serverDest = MongoRunner.runMongod({binVersion: configObj.serverDestVersion});
MongoRunner.runMongoTool("mongorestore", {
dir: configObj.dumpDir + "/" + testBaseName,
@@ -123,8 +114,7 @@ function multiVersionDumpRestoreTest(configObj) {
var shardingTestConfig = {
name: testBaseName + "_sharded_dest",
mongos: [{binVersion: configObj.serverDestVersion}],
- shards:
- [{binVersion: configObj.serverDestVersion, storageEngine: configObj.storageEngine}],
+ shards: [{binVersion: configObj.serverDestVersion}],
config: [{binVersion: configObj.serverDestVersion}],
// TODO: SERVER-24163 remove after v3.4
waitForCSRSSecondaries: false
@@ -244,8 +234,7 @@ function getPermutationIterator(permsObj) {
// 'dumpDir' : [ dumpDir ],
// 'testDbpath' : [ testDbpath ],
// 'dumpType' : [ "mongod", "mongos" ],
-// 'restoreType' : [ "mongod", "mongos" ],
-// 'storageEngine': [ "mmapv1" ]
+// 'restoreType' : [ "mongod", "mongos" ]
// }
//
// This function will run a test for each possible combination of the parameters. See comments on
diff --git a/jstests/multiVersion/libs/multi_cluster.js b/jstests/multiVersion/libs/multi_cluster.js
index 2937d0d4d6d..5d98f942546 100644
--- a/jstests/multiVersion/libs/multi_cluster.js
+++ b/jstests/multiVersion/libs/multi_cluster.js
@@ -3,8 +3,8 @@
//
/**
- * Restarts the specified binaries in options with the specified binVersion.
- * Note: this does not perform any upgrade operations.
+ * Restarts the specified binaries in options to the binVersion. Note: this does not
+ * perform any upgrade operations.
*
* @param binVersion {string}
* @param options {Object} format:
diff --git a/jstests/multiVersion/minor_version_downgrade_replset.js b/jstests/multiVersion/minor_version_downgrade_replset.js
index 3c67a237075..e0cc1fe5812 100644
--- a/jstests/multiVersion/minor_version_downgrade_replset.js
+++ b/jstests/multiVersion/minor_version_downgrade_replset.js
@@ -1,6 +1,5 @@
// Test the downgrade of a replica set from latest version
// to last-stable version succeeds, while reads and writes continue.
-// @tags: [requires_mmapv1]
load('./jstests/multiVersion/libs/multi_rs.js');
load('./jstests/libs/test_background_ops.js');
@@ -16,9 +15,7 @@ var nodes = {
n3: {binVersion: newVersion}
};
-// SERVER-25132 - Only runs in mmapv1
-var storageEngine = "mmapv1";
-var rst = new ReplSetTest({name: name, nodes: nodes, nodeOptions: {storageEngine: storageEngine}});
+var rst = new ReplSetTest({name: name, nodes: nodes, nodeOptions: {storageEngine: 'mmapv1'}});
rst.startSet();
var replSetConfig = rst.getReplSetConfig();
replSetConfig.protocolVersion = 0;
@@ -45,7 +42,7 @@ jsTest.log("Starting parallel operations during downgrade..");
var joinFindInsert = startParallelOps(primary, insertDocuments, [rst.getURL(), coll]);
jsTest.log("Downgrading replica set..");
-rst.upgradeSet({binVersion: oldVersion, storageEngine: storageEngine});
+rst.upgradeSet({binVersion: oldVersion});
jsTest.log("Downgrade complete.");
primary = rst.getPrimary();
diff --git a/jstests/multiVersion/mmapv1_overrides_default_storage_engine.js b/jstests/multiVersion/mmapv1_overrides_default_storage_engine.js
index 371e2c552ab..7e6d61e9f1d 100644
--- a/jstests/multiVersion/mmapv1_overrides_default_storage_engine.js
+++ b/jstests/multiVersion/mmapv1_overrides_default_storage_engine.js
@@ -1,8 +1,6 @@
/**
* Test the upgrade process for 2.6 ~~> 3.2 and 3.0 ~~> 3.2, where mmapv1 should continue to be the
* default storage engine. Repeat the process with --directoryperdb set.
- *
- * @tags: [requires_mmapv1]
*/
(function() {
'use strict';
@@ -24,11 +22,6 @@
},
];
- // Since this test requires not specifying the storageEngine, delete it before invoking test.
- if (typeof TestData === "object" && TestData !== null) {
- delete TestData.storageEngine;
- }
-
// The mongod should start up with mmapv1 when the --storageEngine flag is omitted, or when
// --storageEngine=mmapv1 is explicitly specified.
testCases.forEach(function(testCase) {
diff --git a/jstests/multiVersion/multikey_paths_downgrade.js b/jstests/multiVersion/multikey_paths_downgrade.js
index bcc8ba15009..ec15f5c9222 100644
--- a/jstests/multiVersion/multikey_paths_downgrade.js
+++ b/jstests/multiVersion/multikey_paths_downgrade.js
@@ -30,7 +30,7 @@
noCleanData: true,
// We explicitly set the storage engine as part of the options because not all versions
// being tested automatically detect it from the storage.bson file.
- storageEngine: jsTest.options().storageEngine,
+ storageEngine: jsTest.options().storageEngine || "wiredTiger",
};
if (defaultOptions.storageEngine === "mmapv1") {
diff --git a/jstests/multiVersion/partial_index_upgrade.js b/jstests/multiVersion/partial_index_upgrade.js
index 81a45779953..b19631ae3b3 100644
--- a/jstests/multiVersion/partial_index_upgrade.js
+++ b/jstests/multiVersion/partial_index_upgrade.js
@@ -31,7 +31,6 @@
var defaultOptions = {
dbpath: dbpath,
noCleanData: true,
- storageEngine: jsTest.options().storageEngine
};
// Start the old version.
diff --git a/jstests/multiVersion/readmode_compatibility.js b/jstests/multiVersion/readmode_compatibility.js
index 2e2ca2774cb..ae6f9c7d56d 100644
--- a/jstests/multiVersion/readmode_compatibility.js
+++ b/jstests/multiVersion/readmode_compatibility.js
@@ -4,9 +4,7 @@
(function() {
'use strict';
- var storageEngine = jsTest.options().storageEngine;
-
- var conn30 = MongoRunner.runMongod({binVersion: '3.0', storageEngine: storageEngine});
+ var conn30 = MongoRunner.runMongod({binVersion: '3.0'});
assert.neq(conn30, null, 'unable to start 3.0 mongod');
// Force writeMode to "commands" so that we can check the results of write operations.
@@ -34,7 +32,7 @@
// With the latest version of mongod, forcing the readMode to "compatibility" and then asking
// for the readMode should cause the shell to resolve the readMode to "commands".
- var connLatest = MongoRunner.runMongod({storageEngine: storageEngine});
+ var connLatest = MongoRunner.runMongod({});
assert.neq(connLatest, null, 'unable to start 3.2 mongod');
connLatest.forceReadMode('compatibility');
assert.eq('commands', connLatest.readMode());
diff --git a/jstests/multiVersion/server-23299-2.js b/jstests/multiVersion/server-23299-2.js
index ea6ae368996..0c54b8cdc97 100644
--- a/jstests/multiVersion/server-23299-2.js
+++ b/jstests/multiVersion/server-23299-2.js
@@ -15,11 +15,9 @@ load('./jstests/multiVersion/libs/verify_versions.js');
var versionsNotSubjectToSERVER23299 = ['latest', '3.0'];
function doTest(priorVersion, expectTempToDrop) {
- var storageEngine = jsTest.options().storageEngine;
jsTest.log((expectTempToDrop ? "" : " not") + " expecting temp collections created in " +
priorVersion + " to be dropped when starting latest mongod version");
- var mongod =
- MongoRunner.runMongod({binVersion: priorVersion, storageEngine: storageEngine});
+ var mongod = MongoRunner.runMongod({binVersion: priorVersion});
assert.binVersion(mongod, priorVersion);
assert.commandWorked(mongod.getDB("test").createCollection("tempcoll", {temp: true}));
assert.writeOK(mongod.getDB("test").tempcoll.insert({_id: 0}));
@@ -27,9 +25,8 @@ load('./jstests/multiVersion/libs/verify_versions.js');
MongoRunner.stopMongod(mongod);
var newOpts = Object.extend({}, mongod.fullOptions);
- mongod = MongoRunner.runMongod(
- Object.extend(Object.extend({}, mongod.fullOptions),
- {restart: true, binVersion: "latest", storageEngine: storageEngine}));
+ mongod = MongoRunner.runMongod(Object.extend(Object.extend({}, mongod.fullOptions),
+ {restart: true, binVersion: "latest"}));
assert.binVersion(mongod, "latest");
assert.eq(expectTempToDrop ? 0 : 1, mongod.getDB("test").tempcoll.find().itcount());
}
diff --git a/jstests/multiVersion/wt_index_option_defaults_replset.js b/jstests/multiVersion/wt_index_option_defaults_replset.js
index c3bc4a535fc..af17bd182b8 100644
--- a/jstests/multiVersion/wt_index_option_defaults_replset.js
+++ b/jstests/multiVersion/wt_index_option_defaults_replset.js
@@ -2,8 +2,6 @@
* Creates a replica set with a 3.2 primary and a 3.0 secondary. Tests that the
* "indexOptionDefaults" specified to collection creation are replicated by the 3.2 primary, but
* ignored by the 3.0 secondary.
- *
- * @tags: [requires_wiredtiger]
*/
(function() {
'use strict';
View Lorry Controller Status