summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDianna Hohensee <dianna.hohensee@10gen.com>2016-02-03 10:18:18 -0500
committerDianna Hohensee <dianna.hohensee@10gen.com>2016-02-03 16:36:01 -0500
commitec81d5946837e6ad0c3818837f88a1f3f056248b (patch)
treee8f30062350a9e3b73f762e0a5b0e1014487e277
parent9cf9323912eb732ed4c6ced5f926e1e0bca46e9f (diff)
downloadmongo-ec81d5946837e6ad0c3818837f88a1f3f056248b.tar.gz
SERVER-20290 Fixing race condition in donor_shard_abort_and_start_new_migration.js between aborting first migration and starting second migration.
-rw-r--r--jstests/sharding/donor_shard_abort_and_start_new_migration.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/jstests/sharding/donor_shard_abort_and_start_new_migration.js b/jstests/sharding/donor_shard_abort_and_start_new_migration.js
index d2ee79ed5f0..c15f7c52e07 100644
--- a/jstests/sharding/donor_shard_abort_and_start_new_migration.js
+++ b/jstests/sharding/donor_shard_abort_and_start_new_migration.js
@@ -131,6 +131,9 @@ for (var op in inProgressOps) {
}
}
unpauseMoveChunkAtStep(donor, moveChunkStepNames.startedMoveChunk);
+assert.throws(function() {
+ joinFooMoveChunk();
+});
/**
* Start second moveChunk operation in the background: moving chunk [10, 20) in testDB.baz
@@ -170,9 +173,6 @@ assert.eq(4, bazColl.count(), "Failed to insert documents into baz collection!")
jsTest.log('Finishing first migration, which should fail....');
unpauseMigrateAtStep(fooRecipient, migrateStepNames.cloned);
-assert.throws(function() {
- joinFooMoveChunk();
-});
/**
* Unpause bazRecipient (disable failpoint) and finish second migration, which should