diff options
| author | Ruoxin Xu <ruoxin.xu@mongodb.com> | 2020-03-06 23:32:52 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-19 12:06:50 +0000 |
| commit | c00b8e8cd6935c2816ae7173359cd97818abd590 (patch) | |
| tree | 60bd3071ce222fd1cc7d9fc99ab6fa28455fad64 /src/mongo/db/exhaust_cursor_currentop_integration_test.cpp | |
| parent | fc50384c81d14e9db5c76385006b94f3eaa5e52b (diff) | |
| download | mongo-c00b8e8cd6935c2816ae7173359cd97818abd590.tar.gz | |
SERVER-43614 Added "_failPointMessage" field in CurOp for Failpoints used only.
Diffstat (limited to 'src/mongo/db/exhaust_cursor_currentop_integration_test.cpp')
| -rw-r--r-- | src/mongo/db/exhaust_cursor_currentop_integration_test.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mongo/db/exhaust_cursor_currentop_integration_test.cpp b/src/mongo/db/exhaust_cursor_currentop_integration_test.cpp index 53e97568da1..e7c6001e99b 100644 --- a/src/mongo/db/exhaust_cursor_currentop_integration_test.cpp +++ b/src/mongo/db/exhaust_cursor_currentop_integration_test.cpp @@ -182,10 +182,11 @@ auto startExhaustQuery( void runOneGetMore(DBClientBase* conn, const std::unique_ptr<DBClientCursor>& queryCursor, int nDocsReturned) { - const auto curOpMatch = BSON("command.collection" << testNSS.coll() << "command.getMore" - << queryCursor->getCursorId() << "msg" - << "waitWithPinnedCursorDuringGetMoreBatch" - << "cursor.nDocsReturned" << nDocsReturned); + const auto curOpMatch = + BSON("command.collection" << testNSS.coll() << "command.getMore" + << queryCursor->getCursorId() << "failpointMsg" + << "waitWithPinnedCursorDuringGetMoreBatch" + << "cursor.nDocsReturned" << nDocsReturned); // Confirm that the initial getMore appears in the $currentOp output. ASSERT(confirmCurrentOpContents(conn, curOpMatch)); @@ -196,7 +197,7 @@ void runOneGetMore(DBClientBase* conn, // Confirm that the getMore completed its batch and hit the post-getMore failpoint. ASSERT(confirmCurrentOpContents( conn, - BSON("command.getMore" << queryCursor->getCursorId() << "msg" + BSON("command.getMore" << queryCursor->getCursorId() << "failpointMsg" << "waitBeforeUnpinningOrDeletingCursorAfterGetMoreBatch"))); // Re-enable the original failpoint to catch the next getMore, and release the current one. @@ -277,7 +278,7 @@ void testClientDisconnect(bool disconnectAfterGetMoreBatch) { // The next getMore will be an exhaust getMore. Confirm that the exhaust getMore appears in the // $currentOp output. auto curOpMatch = BSON("command.collection" << testNSS.coll() << "command.getMore" - << queryCursor->getCursorId() << "msg" + << queryCursor->getCursorId() << "failpointMsg" << "waitWithPinnedCursorDuringGetMoreBatch" << "cursor.nDocsReturned" << 3); ASSERT(confirmCurrentOpContents(conn.get(), curOpMatch)); @@ -288,7 +289,7 @@ void testClientDisconnect(bool disconnectAfterGetMoreBatch) { setWaitWithPinnedCursorDuringGetMoreBatchFailpoint(conn.get(), false); ASSERT(confirmCurrentOpContents(conn.get(), BSON("command.getMore" - << queryCursor->getCursorId() << "msg" + << queryCursor->getCursorId() << "failpointMsg" << "waitAfterCommandFinishesExecution"))); } |