summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2018-02-22 09:27:18 -0500
committerMaria van Keulen <maria@mongodb.com>2018-02-23 09:19:29 -0500
commit7dbbe6c7b33135c4f1f27bcd84dcca6c711f240e (patch)
treef644ce8cc2f097b99277b24b5640838a7fb8a069
parent1af47155814e1628b92597a58ed489b7509b6425 (diff)
downloadmongo-7dbbe6c7b33135c4f1f27bcd84dcca6c711f240e.tar.gz
SERVER-32597 Remove unnecessary fCV initialization
-rw-r--r--jstests/multiVersion/libs/initial_sync.js6
-rw-r--r--jstests/multiVersion/upgrade_downgrade_while_creating_collection.js4
-rw-r--r--jstests/replsets/libs/rename_across_dbs.js6
3 files changed, 0 insertions, 16 deletions
diff --git a/jstests/multiVersion/libs/initial_sync.js b/jstests/multiVersion/libs/initial_sync.js
index 6d108419319..4999a6a2405 100644
--- a/jstests/multiVersion/libs/initial_sync.js
+++ b/jstests/multiVersion/libs/initial_sync.js
@@ -26,12 +26,6 @@ var multversionInitialSyncTest = function(
// Wait for a primary node.
var primary = rst.getPrimary();
- // TODO(SERVER-32597) remove this when fCV 4.0 becomes the default on clean startup.
- if (replSetVersion == "latest") {
- assert.commandWorked(primary.adminCommand({setFeatureCompatibilityVersion: "4.0"}));
- rst.awaitReplication();
- }
-
// Set 'featureCompatibilityVersion' if given.
if (fcv) {
jsTestLog("Setting FCV to '" + fcv + "' on the primary.");
diff --git a/jstests/multiVersion/upgrade_downgrade_while_creating_collection.js b/jstests/multiVersion/upgrade_downgrade_while_creating_collection.js
index bc9fcbf239d..8926cbdfa90 100644
--- a/jstests/multiVersion/upgrade_downgrade_while_creating_collection.js
+++ b/jstests/multiVersion/upgrade_downgrade_while_creating_collection.js
@@ -19,10 +19,6 @@
const primary = rst.getPrimary();
const primaryDB = primary.getDB("test");
- // TODO(SERVER-32597) remove this when fCV 4.0 becomes the default on clean startup.
- assert.commandWorked(primaryDB.adminCommand({setFeatureCompatibilityVersion: latestFCV}));
- rst.awaitReplication();
-
for (let versions
of[{from: lastStableFCV, to: latestFCV}, {from: latestFCV, to: lastStableFCV}]) {
jsTestLog("Changing FeatureCompatibilityVersion from " + versions.from + " to " +
diff --git a/jstests/replsets/libs/rename_across_dbs.js b/jstests/replsets/libs/rename_across_dbs.js
index 9691a2efd0f..9b0298740a0 100644
--- a/jstests/replsets/libs/rename_across_dbs.js
+++ b/jstests/replsets/libs/rename_across_dbs.js
@@ -48,12 +48,6 @@ var RenameAcrossDatabasesTest = function(options) {
replTest.startSet();
replTest.initiate();
- // TODO(SERVER-32597) remove this when fCV 4.0 becomes the default on clean startup.
- if (nodes[0].binVersion == 'latest') {
- assert.commandWorked(
- replTest.getPrimary().adminCommand({setFeatureCompatibilityVersion: '4.0'}));
- }
-
// If provided in 'options', we set the featureCompatibilityVersion. We do this prior to
// adding any other members to the replica set.
if (options.setFeatureCompatibilityVersion) {