summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Saltz <matthew.saltz@mongodb.com>2019-11-18 20:19:13 +0000
committerevergreen <evergreen@mongodb.com>2019-11-18 20:19:13 +0000
commitb7f72c287e1ab9a92b784697a80211e3f365cd08 (patch)
tree53e7bda7835b03f92b9ffe4f667d7f437b2d0f1f
parent6a2cc7922255ad7538b10be3d288b44bdb6a3dd6 (diff)
downloadmongo-b7f72c287e1ab9a92b784697a80211e3f365cd08.tar.gz
SERVER-32692 Make zbigMapReduce.js, sharding_balance4.js, and bulk_shard_insert.js more resilient under slow machines
(cherry picked from commit 1e0f4f8136e640d90093476695bb07b851da2da9) (cherry picked from commit a17bb0d5dcf4294954c4b2468216335a5e9b9023)
-rw-r--r--jstests/sharding/bulk_shard_insert.js10
-rw-r--r--jstests/sharding/sharding_balance4.js10
-rw-r--r--jstests/sharding/zbigMapReduce.js10
3 files changed, 30 insertions, 0 deletions
diff --git a/jstests/sharding/bulk_shard_insert.js b/jstests/sharding/bulk_shard_insert.js
index 6db6a62c998..0bdcd7a6d26 100644
--- a/jstests/sharding/bulk_shard_insert.js
+++ b/jstests/sharding/bulk_shard_insert.js
@@ -11,6 +11,16 @@
var st = new ShardingTest({shards: 4, chunkSize: 1});
+ // Double the balancer interval to produce fewer migrations per unit time so that the test does
+ // not run out of stale shard version retries.
+ st._configServers.forEach((conn) => {
+ conn.adminCommand({
+ configureFailPoint: 'overrideBalanceRoundInterval',
+ mode: 'alwaysOn',
+ data: {intervalMs: 2000}
+ });
+ });
+
assert.commandWorked(st.s0.adminCommand({enableSharding: 'TestDB'}));
st.ensurePrimaryShard('TestDB', st.shard0.shardName);
assert.commandWorked(
diff --git a/jstests/sharding/sharding_balance4.js b/jstests/sharding/sharding_balance4.js
index 75a30b62b9a..9dbe1b969a2 100644
--- a/jstests/sharding/sharding_balance4.js
+++ b/jstests/sharding/sharding_balance4.js
@@ -9,6 +9,16 @@
var s = new ShardingTest({shards: 2, mongos: 1, other: {chunkSize: 1, enableAutoSplit: true}});
+ // Double the balancer interval to produce fewer migrations per unit time so that the test does
+ // not run out of stale shard version retries.
+ s._configServers.forEach((conn) => {
+ conn.adminCommand({
+ configureFailPoint: 'overrideBalanceRoundInterval',
+ mode: 'alwaysOn',
+ data: {intervalMs: 2000}
+ });
+ });
+
assert.commandWorked(s.s0.adminCommand({enablesharding: "test"}));
s.ensurePrimaryShard('test', s.shard1.shardName);
assert.commandWorked(s.s0.adminCommand({shardcollection: "test.foo", key: {_id: 1}}));
diff --git a/jstests/sharding/zbigMapReduce.js b/jstests/sharding/zbigMapReduce.js
index 4710c3b4c0c..7ea2a03941d 100644
--- a/jstests/sharding/zbigMapReduce.js
+++ b/jstests/sharding/zbigMapReduce.js
@@ -19,6 +19,16 @@
}
});
+ // Double the balancer interval to produce fewer migrations per unit time so that the test does
+ // not run out of stale shard version retries.
+ s._configServers.forEach((conn) => {
+ conn.adminCommand({
+ configureFailPoint: 'overrideBalanceRoundInterval',
+ mode: 'alwaysOn',
+ data: {intervalMs: 2000}
+ });
+ });
+
assert.commandWorked(s.s0.adminCommand({enablesharding: "test"}));
s.ensurePrimaryShard('test', s.shard0.shardName);
assert.commandWorked(s.s0.adminCommand({shardcollection: "test.foo", key: {"_id": 1}}));