diff options
author | Cheahuychou Mao <cheahuychou.mao@mongodb.com> | 2020-02-14 11:37:46 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-18 16:42:51 +0000 |
commit | 9d3cc90b7a758d39c5668c136950883490d5c558 (patch) | |
tree | 33a93c1a776d72a97b7114590a35525a10cc19f7 | |
parent | d071cb84a096c87498a3f73f5043b64b51d649d9 (diff) | |
download | mongo-9d3cc90b7a758d39c5668c136950883490d5c558.tar.gz |
SERVER-45273 Remove the mongos version check in allow_partial_results.js and return_partial_shards_down.js
(cherry picked from commit d9a68d2c084bfed60527aa9aa29e2a843b97e9c2)
-rw-r--r-- | jstests/sharding/allow_partial_results.js | 13 | ||||
-rw-r--r-- | jstests/sharding/return_partial_shards_down.js | 5 |
2 files changed, 6 insertions, 12 deletions
diff --git a/jstests/sharding/allow_partial_results.js b/jstests/sharding/allow_partial_results.js index dd90c7ed50e..bf03f1da8b2 100644 --- a/jstests/sharding/allow_partial_results.js +++ b/jstests/sharding/allow_partial_results.js @@ -56,14 +56,11 @@ assert.commandFailed(coll.runCommand({find: collName})); jsTest.log("With 'allowPartialResults: false', if some shard down, find fails."); assert.commandFailed(coll.runCommand({find: collName, allowPartialResults: false})); -// TODO (SERVER-45273): Remove this mongos bin version check. -if (jsTestOptions().mongosBinVersion != "last-stable") { - jsTest.log( - "With 'allowPartialResults: true', if some shard down, find succeeds with partial results"); - findRes = coll.runCommand({find: collName, allowPartialResults: true}); - assert.commandWorked(findRes); - assert.eq(nDocs / 2, findRes.cursor.firstBatch.length); -} +jsTest.log( + "With 'allowPartialResults: true', if some shard down, find succeeds with partial results"); +findRes = coll.runCommand({find: collName, allowPartialResults: true}); +assert.commandWorked(findRes); +assert.eq(nDocs / 2, findRes.cursor.firstBatch.length); jsTest.log("The allowPartialResults option does not currently apply to aggregation."); assert.commandFailedWithCode(coll.runCommand({ diff --git a/jstests/sharding/return_partial_shards_down.js b/jstests/sharding/return_partial_shards_down.js index 2015b35121a..ab5d2774dfb 100644 --- a/jstests/sharding/return_partial_shards_down.js +++ b/jstests/sharding/return_partial_shards_down.js @@ -6,10 +6,7 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true; var checkDocCount = function(coll, returnPartialFlag, shardsDown, expectedCount) { - // TODO (SERVER-45273): Remove this mongos bin version check. - if (jsTestOptions().mongosBinVersion != "last-stable") { - assert.eq(expectedCount, coll.find({}, {}, 0, 0, 0, returnPartialFlag).itcount()); - } + assert.eq(expectedCount, coll.find({}, {}, 0, 0, 0, returnPartialFlag).itcount()); }; var st = new ShardingTest({shards: 3, mongos: 1, other: {mongosOptions: {verbose: 2}}}); |