diff options
7 files changed, 98 insertions, 26 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 8d4544bed97..db1e9cd2cc2 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -10096,7 +10096,6 @@ buildvariants: test_flags: >- --mongodSetParameters="{maxNumberOfTransactionOperationsInSingleOplogEntry: 2}" --excludeWithAnyTags=exclude_from_large_txns - --excludeWithAnyTags=exclude_from_large_txns_due_to_change_streams tasks: - name: compile_TG distros: diff --git a/jstests/change_streams/report_post_batch_resume_token.js b/jstests/change_streams/report_post_batch_resume_token.js index 75cfc927f6d..1055288a9f5 100644 --- a/jstests/change_streams/report_post_batch_resume_token.js +++ b/jstests/change_streams/report_post_batch_resume_token.js @@ -1,7 +1,7 @@ /** * Tests that an aggregate with a $changeStream stage reports the latest postBatchResumeToken. This * test verifies postBatchResumeToken semantics that are common to sharded and unsharded streams. - * @tags: [uses_transactions, exclude_from_large_txns_due_to_change_streams] + * @tags: [uses_transactions] */ (function() { "use strict"; diff --git a/jstests/multiVersion/change_streams_resume_token_version.js b/jstests/multiVersion/change_streams_resume_token_version.js index 09135a5e060..25575683248 100644 --- a/jstests/multiVersion/change_streams_resume_token_version.js +++ b/jstests/multiVersion/change_streams_resume_token_version.js @@ -1,7 +1,6 @@ // Tests that a resume token from FCV 4.0 cannot be used with the new 'startAfter' option, because // the old version of the resume token doesn't contain enough information to distinguish an // invalidate event from the event which generated the invalidate. -// @tags: [exclude_from_large_txns_due_to_change_streams] (function() { "use strict"; diff --git a/jstests/noPassthrough/change_stream_transaction.js b/jstests/noPassthrough/change_stream_transaction.js index 801eab6f0a0..fb244c18366 100644 --- a/jstests/noPassthrough/change_stream_transaction.js +++ b/jstests/noPassthrough/change_stream_transaction.js @@ -1,6 +1,12 @@ -// Confirms that change streams only see committed operations for prepared transactions. -// @tags: [uses_transactions,uses_change_streams,requires_majority_read_concern, -// exclude_from_large_txns_due_to_change_streams] +/* + * Confirms that change streams only see committed operations for prepared transactions. + * @tags: [ + * uses_transactions, + * uses_change_streams, + * requires_majority_read_concern, + * uses_prepare_transaction, + * ] + */ (function() { "use strict"; @@ -10,6 +16,12 @@ const collName = "change_stream_transaction"; /** + * This test sets an internal parameter in order to force transactions with more than 4 + * operations to span multiple oplog entries, making it easier to test that scenario. + */ + const maxOpsInOplogEntry = 4; + + /** * Asserts that the expected operation type and documentKey are found on the change stream * cursor. Returns the change stream document. */ @@ -126,19 +138,15 @@ prepareTimestampTxn1 = PrepareHelpers.prepareTransaction(session1); assertNoChanges(changeStreamCursor); - // TODO SERVER-39036: Change writeConcern to majority. Prior to this ticket a majority write - // will block on a prepared transaction. We should also be able to move the check for - // document existence prior to the transaction commit with this change. - // Perform a write at writeConcern w: local. - assert.commandWorked(coll.insert({_id: "no-txn-doc-3"}, {writeConcern: {w: 1}})); + assert.commandWorked(coll.insert({_id: "no-txn-doc-3"}, {writeConcern: {w: "majority"}})); + assertWriteVisibleWithCapture( + changeStreamCursor, "insert", {_id: "no-txn-doc-3"}, changeList); // // Commit first transaction and confirm expected changes. // assert.commandWorked(PrepareHelpers.commitTransaction(session1, prepareTimestampTxn1)); assertWriteVisibleWithCapture( - changeStreamCursor, "insert", {_id: "no-txn-doc-3"}, changeList); - assertWriteVisibleWithCapture( changeStreamCursor, "insert", {_id: "txn1-doc-1"}, changeList); assertWriteVisibleWithCapture( changeStreamCursor, "insert", {_id: "txn1-doc-2"}, changeList); @@ -155,19 +163,75 @@ PrepareHelpers.prepareTransaction(session2); assertNoChanges(changeStreamCursor); - // TODO SERVER-39036: Change writeConcern to majority. Prior to this ticket a majority write - // will block on a prepared transaction. We should also be able to move the check for - // document existence prior to the transaction abort with this change. - // Perform a write at writeConcern w: local. - assert.commandWorked(coll.insert({_id: "no-txn-doc-4"}, {writeConcern: {w: 1}})); + assert.commandWorked(coll.insert({_id: "no-txn-doc-4"}, {writeConcern: {w: "majority"}})); + assertWriteVisibleWithCapture( + changeStreamCursor, "insert", {_id: "no-txn-doc-4"}, changeList); // // Abort second transaction. // - assert.commandWorked(session2.abortTransaction_forTesting()); - assertWriteVisibleWithCapture( - changeStreamCursor, "insert", {_id: "no-txn-doc-4"}, changeList); + session2.abortTransaction_forTesting(); assertNoChanges(changeStreamCursor); + + // + // Start transaction 4. + // + const session4 = db.getMongo().startSession(); + const sessionDb4 = session4.getDatabase(dbName); + const sessionColl4 = sessionDb4[collName]; + session4.startTransaction({readConcern: {level: "majority"}}); + + // Perform enough writes to fill up one applyOps. + const txn4Inserts = Array.from({length: maxOpsInOplogEntry}, + (_, index) => ({_id: {name: "txn4-doc", index: index}})); + txn4Inserts.forEach(function(doc) { + sessionColl4.insert(doc); + assertNoChanges(changeStreamCursor); + }); + + // Perform enough writes to an unwatched collection to fill up a second applyOps. We + // specifically want to test the case where a multi-applyOps transaction has no relevant + // updates in its final applyOps. + txn4Inserts.forEach(function(doc) { + assert.commandWorked(sessionDb4[unwatchedColl.getName()].insert(doc)); + assertNoChanges(changeStreamCursor); + }); + + // + // Start transaction 5. + // + const session5 = db.getMongo().startSession(); + const sessionDb5 = session5.getDatabase(dbName); + const sessionColl5 = sessionDb5[collName]; + session5.startTransaction({readConcern: {level: "majority"}}); + + // Perform enough writes to span 3 applyOps entries. + const txn5Inserts = Array.from({length: 3 * maxOpsInOplogEntry}, + (_, index) => ({_id: {name: "txn5-doc", index: index}})); + txn5Inserts.forEach(function(doc) { + assert.commandWorked(sessionColl5.insert(doc)); + assertNoChanges(changeStreamCursor); + }); + + // + // Prepare and commit transaction 5. + // + const prepareTimestampTxn5 = PrepareHelpers.prepareTransaction(session5); + assertNoChanges(changeStreamCursor); + assert.commandWorked(PrepareHelpers.commitTransaction(session5, prepareTimestampTxn5)); + txn5Inserts.forEach(function(doc) { + assertWriteVisibleWithCapture(changeStreamCursor, "insert", doc, changeList); + }); + + // + // Commit transaction 4 without preparing. + // + session4.commitTransaction(); + txn4Inserts.forEach(function(doc) { + assertWriteVisibleWithCapture(changeStreamCursor, "insert", doc, changeList); + }); + assertNoChanges(changeStreamCursor); + changeStreamCursor.close(); // Test that change stream resume returns the expected set of documents at each point @@ -198,7 +262,19 @@ assert.commandWorked(db.dropDatabase()); } - const rst = new ReplSetTest({nodes: 1}); + let replSetTestDescription = {nodes: 1}; + if (!jsTest.options().setParameters.hasOwnProperty( + "maxNumberOfTransactionOperationsInSingleOplogEntry")) { + // Configure the replica set to use our value for maxOpsInOplogEntry. + replSetTestDescription.nodeOptions = { + setParameter: {maxNumberOfTransactionOperationsInSingleOplogEntry: maxOpsInOplogEntry} + }; + } else { + // The test is executing in a build variant that already defines its own override value for + // maxNumberOfTransactionOperationsInSingleOplogEntry. Even though the build variant's + // choice for this override won't test the same edge cases, the test should still succeed. + } + const rst = new ReplSetTest(replSetTestDescription); rst.startSet(); rst.initiate(); diff --git a/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js b/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js index 391c2cd8bca..c5a27b57e63 100644 --- a/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js +++ b/jstests/noPassthrough/change_streams_resume_token_applyops_overlap.js @@ -2,8 +2,7 @@ * Confirms that resuming from an event which has the same clusterTime as a transaction on another * shard does not cause the resume attempt to be prematurely rejected. Reproduction script for the * bug described in SERVER-40094. - * @tags: [requires_sharding, uses_multi_shard_transaction, uses_transactions, - * exclude_from_large_txns] + * @tags: [requires_sharding, uses_multi_shard_transaction, uses_transactions] */ (function() { "use strict"; diff --git a/jstests/noPassthrough/report_post_batch_resume_token_mongod.js b/jstests/noPassthrough/report_post_batch_resume_token_mongod.js index 0b5d23eb0bb..cf7dd55b1d0 100644 --- a/jstests/noPassthrough/report_post_batch_resume_token_mongod.js +++ b/jstests/noPassthrough/report_post_batch_resume_token_mongod.js @@ -1,6 +1,6 @@ /** * Tests mongoD-specific semantics of postBatchResumeToken for $changeStream aggregations. - * @tags: [uses_transactions, exclude_from_large_txns_due_to_change_streams] + * @tags: [uses_transactions] */ (function() { "use strict"; diff --git a/jstests/sharding/change_stream_transaction_sharded.js b/jstests/sharding/change_stream_transaction_sharded.js index 8ed82b759c8..311f132012f 100644 --- a/jstests/sharding/change_stream_transaction_sharded.js +++ b/jstests/sharding/change_stream_transaction_sharded.js @@ -4,7 +4,6 @@ // uses_change_streams, // uses_multi_shard_transaction, // uses_transactions, -// exclude_from_large_txns_due_to_change_streams, // ] (function() { "use strict"; |