summaryrefslogtreecommitdiff
path: root/jstests/sharding
diff options
context:
space:
mode:
authorJason Chan <jason.chan@mongodb.com>2019-09-09 22:39:39 +0000
committerevergreen <evergreen@mongodb.com>2019-09-09 22:39:39 +0000
commit21ca406e36dac858112259acace5859a304ae0de (patch)
tree92f7ecb108d409e7b0f2a139766ac4de2e1ce972 /jstests/sharding
parent857c21aec7011c9b8858bdd032e9c0c24970faef (diff)
downloadmongo-21ca406e36dac858112259acace5859a304ae0de.tar.gz
SERVER-42761 Move feature_compatibility_version.js into src/mongo/shell
Diffstat (limited to 'jstests/sharding')
-rw-r--r--jstests/sharding/autodiscover_config_rs_from_secondary.js2
-rw-r--r--jstests/sharding/autosplit_include.js1
-rw-r--r--jstests/sharding/config_rs_change.js1
-rw-r--r--jstests/sharding/convert_to_and_from_sharded.js2
-rw-r--r--jstests/sharding/initial_split_validate_shard_collections.js1
-rw-r--r--jstests/sharding/max_time_ms_sharded_new_commands.js2
-rw-r--r--jstests/sharding/mongos_wait_csrs_initiate.js2
7 files changed, 1 insertions, 10 deletions
diff --git a/jstests/sharding/autodiscover_config_rs_from_secondary.js b/jstests/sharding/autodiscover_config_rs_from_secondary.js
index b9e87eeae06..2a8c3cd6c36 100644
--- a/jstests/sharding/autodiscover_config_rs_from_secondary.js
+++ b/jstests/sharding/autodiscover_config_rs_from_secondary.js
@@ -1,8 +1,6 @@
// Tests that mongos can autodiscover a config server replica set when the only node it knows about
// is not the primary.
-load('jstests/libs/feature_compatibility_version.js');
-
(function() {
'use strict';
diff --git a/jstests/sharding/autosplit_include.js b/jstests/sharding/autosplit_include.js
index 8ddf6a2e459..1247a39385c 100644
--- a/jstests/sharding/autosplit_include.js
+++ b/jstests/sharding/autosplit_include.js
@@ -1,4 +1,3 @@
-load("jstests/libs/feature_compatibility_version.js");
/**
* Waits for all ongoing chunk splits, but only if FCV is latest
*/
diff --git a/jstests/sharding/config_rs_change.js b/jstests/sharding/config_rs_change.js
index 9291c45976e..80bb1caa4c9 100644
--- a/jstests/sharding/config_rs_change.js
+++ b/jstests/sharding/config_rs_change.js
@@ -2,7 +2,6 @@
// match the replset config on the config servers, and that it can successfully update it's view
// of the config replset config during startup.
-load("jstests/libs/feature_compatibility_version.js");
var configRS = new ReplSetTest({name: "configRS", nodes: 1, useHostName: true});
configRS.startSet({configsvr: '', journal: "", storageEngine: 'wiredTiger'});
var replConfig = configRS.getReplSetConfig();
diff --git a/jstests/sharding/convert_to_and_from_sharded.js b/jstests/sharding/convert_to_and_from_sharded.js
index 9076e803331..8a347f752f0 100644
--- a/jstests/sharding/convert_to_and_from_sharded.js
+++ b/jstests/sharding/convert_to_and_from_sharded.js
@@ -6,8 +6,6 @@
(function() {
"use strict";
-load("jstests/libs/feature_compatibility_version.js");
-
var NUM_NODES = 3;
/**
diff --git a/jstests/sharding/initial_split_validate_shard_collections.js b/jstests/sharding/initial_split_validate_shard_collections.js
index 537b03a8783..22c81bdc276 100644
--- a/jstests/sharding/initial_split_validate_shard_collections.js
+++ b/jstests/sharding/initial_split_validate_shard_collections.js
@@ -3,7 +3,6 @@
* which spreads the collection across all available shards.
*/
-load("jstests/libs/feature_compatibility_version.js");
load("jstests/libs/uuid_util.js");
(function() {
diff --git a/jstests/sharding/max_time_ms_sharded_new_commands.js b/jstests/sharding/max_time_ms_sharded_new_commands.js
index b611199954e..977650ef6de 100644
--- a/jstests/sharding/max_time_ms_sharded_new_commands.js
+++ b/jstests/sharding/max_time_ms_sharded_new_commands.js
@@ -1,7 +1,7 @@
// Make sure the setFeatureCompatibilityVersion command respects maxTimeMs.
(function() {
'use strict';
-load("./jstests/libs/feature_compatibility_version.js");
+
var st = new ShardingTest({shards: 2});
var mongos = st.s0;
diff --git a/jstests/sharding/mongos_wait_csrs_initiate.js b/jstests/sharding/mongos_wait_csrs_initiate.js
index 315d87eadc4..96da5a9699c 100644
--- a/jstests/sharding/mongos_wait_csrs_initiate.js
+++ b/jstests/sharding/mongos_wait_csrs_initiate.js
@@ -1,7 +1,5 @@
// Tests that mongos will wait for CSRS replica set to initiate.
-load("jstests/libs/feature_compatibility_version.js");
-
var configRS = new ReplSetTest({name: "configRS", nodes: 1, useHostName: true});
configRS.startSet({configsvr: '', journal: "", storageEngine: 'wiredTiger'});
var replConfig = configRS.getReplSetConfig();