summaryrefslogtreecommitdiff
path: root/jstests/replsets/initial_sync2.js
diff options
context:
space:
mode:
authormatt dannenberg <matt.dannenberg@10gen.com>2015-09-28 05:47:57 -0400
committermatt dannenberg <matt.dannenberg@10gen.com>2015-10-01 08:00:10 -0400
commitd789bca4c9fe76cd4d5375e66e281ed5a349e8fd (patch)
treed98b551b8e00ba0c320666f855f3c878414a990a /jstests/replsets/initial_sync2.js
parent1cd101f5bdaae56d67ba7df527da5c6e9352620b (diff)
downloadmongo-d789bca4c9fe76cd4d5375e66e281ed5a349e8fd.tar.gz
SERVER-18498 New replica set configurations have protocolVersion=1 by default
This re-adds Siyuan's work from commits 19d2885ec51768ab73eee0c7239d8eadc0c51d8d and 362aac3937e3ff39ee995919a529297488537191.
Diffstat (limited to 'jstests/replsets/initial_sync2.js')
-rw-r--r--jstests/replsets/initial_sync2.js22
1 files changed, 1 insertions, 21 deletions
diff --git a/jstests/replsets/initial_sync2.js b/jstests/replsets/initial_sync2.js
index 1e519048fae..7888f7d3354 100644
--- a/jstests/replsets/initial_sync2.js
+++ b/jstests/replsets/initial_sync2.js
@@ -147,27 +147,7 @@ for (var i=0; i<10000; i++) {
print("12. Everyone happy eventually");
-// if 3 is master...
-if (master+"" != origMaster+"") {
- print("3 is master");
- slave2 = origMaster;
-}
-
-wait(function() {
- var op1 = getLatestOp(master);
- var op2 = getLatestOp(slave1);
- var op3 = getLatestOp(slave2);
-
- occasionally(function() {
- print("latest ops:");
- printjson(op1);
- printjson(op2);
- printjson(op3);
- });
-
- return friendlyEqual(getLatestOp(master), getLatestOp(slave1)) &&
- friendlyEqual(getLatestOp(master), getLatestOp(slave2));
- });
+replTest.awaitReplication(2 * 60 * 1000);
replTest.stopSet();
};