summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Guo <robert.guo@mongodb.com>2021-10-05 03:22:48 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-10-05 03:46:36 +0000
commit97b2d24bef8dea8f6d9e069be6b810c9c0a9b5af (patch)
treebc03ae2974d0a9680b072df797cc088111a693ac
parentde1400af129cbe6db8abe12fa39f1e8a96c24c40 (diff)
downloadmongo-97b2d24bef8dea8f6d9e069be6b810c9c0a9b5af.tar.gz
SERVER-50389 fix clusterHasBinVersion()
-rw-r--r--src/mongo/shell/shardingtest.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index b044b9e19ff..11cc4604a38 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -971,10 +971,9 @@ var ShardingTest = function(params) {
// Must check shardMixedBinVersion because it causes shardOptions.binVersion to be an
// object (versionIterator) rather than a version string. Must check mongosBinVersion,
// as well, because it does not update mongosOptions.binVersion.
- const isMixedVersionShard =
- (MongoRunner.areBinVersionsTheSame(binVersion, "last-continuous") ||
- MongoRunner.areBinVersionsTheSame(binVersion, "last-lts")) &&
- jsTestOptions().shardMixedBinVersions;
+ const isMixedVersionShard = jsTestOptions().shardMixedBinVersions &&
+ MongoRunner.areBinVersionsTheSame(binVersion,
+ jsTestOptions().shardMixedBinVersions);
const isMixedVersionMongos = jsTestOptions().mongosBinVersion &&
MongoRunner.areBinVersionsTheSame(binVersion, jsTestOptions().mongosBinVersion);
if (isMixedVersionShard || isMixedVersionMongos) {