diff options
| author | Eric Milkie <milkie@10gen.com> | 2013-07-12 14:24:08 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2013-07-12 15:14:09 -0400 |
| commit | 6486b4035c5ac52679eb3e1a034c925ccdd20deb (patch) | |
| tree | c74c2fe36c819534e7444cdbe1aa12f533664304 /jstests/replsets | |
| parent | ac386485a9b9f141a518f2aca1a2b66b8f976104 (diff) | |
| download | mongo-6486b4035c5ac52679eb3e1a034c925ccdd20deb.tar.gz | |
Revert "SERVER-6071 use command on local.slaves instead of cursor"
This reverts commit 2267744af0e972bceccb4ff4e9ed19a1ed639d2e.
Revert "SERVER-6071 correct assert code"
This reverts commit 85ca38c33e4aaebad539e78a05aed329b09c1208.
Conflicts:
src/mongo/db/repl/sync_source_feedback.cpp
Revert "SERVER-6071 use command on local.slaves instead of cursor"
This reverts commit 83ecb9775b7997dd5115c53f6ea30d2e368a4244.
Conflicts:
src/mongo/db/repl/replset_commands.cpp
src/mongo/db/repl/sync_source_feedback.cpp
Diffstat (limited to 'jstests/replsets')
| -rw-r--r-- | jstests/replsets/sync2.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jstests/replsets/sync2.js b/jstests/replsets/sync2.js index 397680a725f..258cfd3ee12 100644 --- a/jstests/replsets/sync2.js +++ b/jstests/replsets/sync2.js @@ -51,8 +51,9 @@ replTest.partition(4,3); jsTestLog("Checking that ops still replicate correctly"); master.getDB("foo").bar.insert({x:1}); +replTest.awaitReplication(); -var result = master.getDB("admin").runCommand({getLastError:1,w:5,wtimeout:30000}); +var result = master.getDB("admin").runCommand({getLastError:1,w:5,wtimeout:1000}); assert.eq(null, result.err, tojson(result)); // 4 is connected to 3 @@ -60,8 +61,9 @@ replTest.partition(4,2); replTest.unPartition(4,3); master.getDB("foo").bar.insert({x:1}); +replTest.awaitReplication(); -result = master.getDB("admin").runCommand({getLastError:1,w:5,wtimeout:30000}); +result = master.getDB("admin").runCommand({getLastError:1,w:5,wtimeout:1000}); assert.eq(null, result.err, tojson(result)); -replTest.stopSet(); +replTest.stopSet();
\ No newline at end of file |