diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2015-10-28 05:40:21 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2015-10-30 11:03:41 -0400 |
| commit | 847c0f67ad0f8f0469c7e4afb0936741ec0baafe (patch) | |
| tree | 2d77122cefefd4ee6868bb2e09b28d1589063d7f /jstests | |
| parent | 0be09f42c8abbbb1e01859740b86713fc8b90580 (diff) | |
| download | mongo-847c0f67ad0f8f0469c7e4afb0936741ec0baafe.tar.gz | |
SERVER-21129 wait for batch apply flush in a separate thread
Diffstat (limited to 'jstests')
| -rw-r--r-- | jstests/replsets/rollback.js | 1 | ||||
| -rw-r--r-- | jstests/replsets/rollback2.js | 1 | ||||
| -rwxr-xr-x | jstests/replsets/rollback3.js | 1 | ||||
| -rw-r--r-- | jstests/slow2/rollback4.js | 3 |
4 files changed, 5 insertions, 1 deletions
diff --git a/jstests/replsets/rollback.js b/jstests/replsets/rollback.js index 2659b08c71d..685a951a2a4 100644 --- a/jstests/replsets/rollback.js +++ b/jstests/replsets/rollback.js @@ -129,6 +129,7 @@ load("jstests/replsets/rslib.js"); replTest.unPartition(1, 2); awaitOpTime(b.getMongo(), getLatestOp(a_conn).ts); + replTest.awaitSecondaryNodes(); replTest.awaitReplication(); checkFinalResults(a); checkFinalResults(b); diff --git a/jstests/replsets/rollback2.js b/jstests/replsets/rollback2.js index 8897455515c..00a8c9d8256 100644 --- a/jstests/replsets/rollback2.js +++ b/jstests/replsets/rollback2.js @@ -111,6 +111,7 @@ load("jstests/replsets/rslib.js"); awaitOpTime(b.getMongo(), getLatestOp(a_conn).ts); // await steady state and ensure the two nodes have the same contents + replTest.awaitSecondaryNodes(); replTest.awaitReplication(); checkFinalResults(a); checkFinalResults(b); diff --git a/jstests/replsets/rollback3.js b/jstests/replsets/rollback3.js index 762f7589b41..9c9d8589cdc 100755 --- a/jstests/replsets/rollback3.js +++ b/jstests/replsets/rollback3.js @@ -134,6 +134,7 @@ load("jstests/replsets/rslib.js"); awaitOpTime(b.getMongo(), getLatestOp(a_conn).ts); // await steady state and ensure the two nodes have the same contents + replTest.awaitSecondaryNodes(); replTest.awaitReplication(); checkFinalResults(a); checkFinalResults(b); diff --git a/jstests/slow2/rollback4.js b/jstests/slow2/rollback4.js index 5c1cc5422ce..12dc73cfee5 100644 --- a/jstests/slow2/rollback4.js +++ b/jstests/slow2/rollback4.js @@ -58,4 +58,5 @@ master.getDB( 'db' ).c.save( big ); // Restart old master replTest.restart( 0 ); // Wait five minutes to ensure there is enough time for rollback -replTest.awaitReplication(5*60*1000); +replTest.awaitSecondaryNodes(5*60*1000); +replTest.awaitReplication(); |