diff options
| author | Matthew Saltz <matthew.saltz@mongodb.com> | 2018-03-22 18:04:11 -0400 |
|---|---|---|
| committer | Matthew Saltz <matthew.saltz@mongodb.com> | 2018-03-28 19:23:57 -0400 |
| commit | 4834884015b037c879dc8083a30563ac8e4c1215 (patch) | |
| tree | f53863a054ba898f204f30ba115f646fc9e8d210 /src/mongo/shell | |
| parent | d2acaa1e46744627bc38ad7ad6e786415a6dbc4d (diff) | |
| download | mongo-4834884015b037c879dc8083a30563ac8e4c1215.tar.gz | |
SERVER-31376: Changed check for latest binVersion in ReplSetTest now that last-stable is 3.6
Diffstat (limited to 'src/mongo/shell')
| -rw-r--r-- | src/mongo/shell/replsettest.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js index e8e719d59f1..933fc042160 100644 --- a/src/mongo/shell/replsettest.js +++ b/src/mongo/shell/replsettest.js @@ -945,8 +945,9 @@ var ReplSetTest = function(opts) { let val = self.nodeOptions[key]; if (typeof(val) === "object" && (val.hasOwnProperty("shardsvr") || - // TODO: SERVER-31376 - val.hasOwnProperty("binVersion") && val.binVersion != "latest")) { + val.hasOwnProperty("binVersion") && + // Should not wait for keys if version is less than 3.6 + MongoRunner.compareBinVersions(val.binVersion, "3.6") == -1)) { shouldWaitForKeys = false; print("Set shouldWaitForKeys from node options: " + shouldWaitForKeys); } @@ -955,7 +956,9 @@ var ReplSetTest = function(opts) { let val = self.startOptions; if (typeof(val) === "object" && (val.hasOwnProperty("shardsvr") || - val.hasOwnProperty("binVersion") && val.binVersion != "latest")) { + val.hasOwnProperty("binVersion") && + // Should not wait for keys if version is less than 3.6 + MongoRunner.compareBinVersions(val.binVersion, "3.6") == -1)) { shouldWaitForKeys = false; print("Set shouldWaitForKeys from start options: " + shouldWaitForKeys); } |