diff options
| author | Bernard Gorman <bernard.gorman@gmail.com> | 2017-09-25 18:14:27 -0400 |
|---|---|---|
| committer | Bernard Gorman <bernard.gorman@gmail.com> | 2017-09-26 12:44:30 -0400 |
| commit | b3b44c1ecd30adaf7421ef9c93a237693a1fca06 (patch) | |
| tree | 8f96e8027522352963e5a62ef05d4e0678887f1f /jstests/change_streams/change_stream.js | |
| parent | 4edbec2c6caf55412e7aad36af6f33fcc8c67b29 (diff) | |
| download | mongo-b3b44c1ecd30adaf7421ef9c93a237693a1fca06.tar.gz | |
SERVER-29141 Refactor the way mongos handles tailable awaitData cursors
Diffstat (limited to 'jstests/change_streams/change_stream.js')
| -rw-r--r-- | jstests/change_streams/change_stream.js | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/jstests/change_streams/change_stream.js b/jstests/change_streams/change_stream.js index 5e06eae5b52..09edb35f647 100644 --- a/jstests/change_streams/change_stream.js +++ b/jstests/change_streams/change_stream.js @@ -52,22 +52,20 @@ readConcern: {level: "local", afterClusterTime: db.getSession().getOperationTime()} })); FixtureHelpers.awaitReplication(); - if (expectedBatch.length == 0) - FixtureHelpers.runCommandOnEachPrimary({ - dbName: "admin", - cmdObj: {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "alwaysOn"} - }); + if (expectedBatch.length == 0) { + assert.commandWorked(db.adminCommand( + {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "alwaysOn"})); + } let res = assert.commandWorked(db.runCommand({ getMore: cursor.id, collection: getCollectionNameFromFullNamespace(cursor.ns), maxTimeMS: 5 * 60 * 1000, batchSize: (expectedBatch.length + 1) })); - if (expectedBatch.length == 0) - FixtureHelpers.runCommandOnEachPrimary({ - dbName: "admin", - cmdObj: {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "off"} - }); + if (expectedBatch.length == 0) { + assert.commandWorked(db.adminCommand( + {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "off"})); + } assert.docEq(res.cursor.nextBatch, expectedBatch); } @@ -296,20 +294,16 @@ readConcern: {level: "local", afterClusterTime: db.getSession().getOperationTime()} })); FixtureHelpers.awaitReplication(); - FixtureHelpers.runCommandOnEachPrimary({ - dbName: "admin", - cmdObj: {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "alwaysOn"} - }); + assert.commandWorked(db.adminCommand( + {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "alwaysOn"})); let res = assert.commandWorked(db.runCommand({ getMore: cursor.id, collection: getCollectionNameFromFullNamespace(cursor.ns), batchSize: 1 })); assert.eq(res.cursor.nextBatch.length, 1); - FixtureHelpers.runCommandOnEachPrimary({ - dbName: "admin", - cmdObj: {configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "off"} - }); + assert.commandWorked( + db.adminCommand({configureFailPoint: "disableAwaitDataForGetMoreCmd", mode: "off"})); return res.cursor.nextBatch[0]; } |