summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Osta <luis.osta@mongodb.com>2021-10-01 13:19:06 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-10-01 14:24:14 +0000
commit65228c9bd0da47c4f56f3b9bb13820f34d2dd9ea (patch)
treec430c92bb6e872a2b8acbd132bf30dc408e74dcd
parent583da4199d4a9e9831a5c0c93ead89d1ba3ca002 (diff)
downloadmongo-65228c9bd0da47c4f56f3b9bb13820f34d2dd9ea.tar.gz
SERVER-59916 Force failing transaction in write_conflicts to end
-rw-r--r--etc/evergreen.yml2
-rw-r--r--jstests/core/txns/libs/write_conflicts.js10
2 files changed, 11 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 1e687b7d0bd..44c326e9f65 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -8777,7 +8777,7 @@ buildvariants:
jstestfuzz_concurrent_num_files: 10
target_resmoke_time: 10
large_distro_name: rhel62-large
- burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-inmem linux-64-duroff enterprise-rhel-62-64-bit-multiversion enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
+ burn_in_tag_buildvariants: enterprise-rhel-62-64-bit-majority-read-concern-off enterprise-rhel-62-64-bit-store-fam-images-in-side-coll
tasks:
- name: compile_all_run_unittests_TG
distros:
diff --git a/jstests/core/txns/libs/write_conflicts.js b/jstests/core/txns/libs/write_conflicts.js
index fdaf2114d82..ca40a0ca1c1 100644
--- a/jstests/core/txns/libs/write_conflicts.js
+++ b/jstests/core/txns/libs/write_conflicts.js
@@ -56,6 +56,11 @@ var WriteConflictHelpers = (function() {
assert.commandWorked(session1.commitTransaction_forTesting());
assert.commandFailedWithCode(session2.commitTransaction_forTesting(),
ErrorCodes.NoSuchTransaction);
+
+ session2.startTransaction();
+ assert.commandWorked(session2Coll.runCommand(
+ {find: collName})); // Start finalizing transaction with a no-op.
+ assert.commandWorked(session2.commitTransaction_forTesting());
}
/**
@@ -91,6 +96,11 @@ var WriteConflictHelpers = (function() {
assert.commandFailedWithCode(res, ErrorCodes.WriteConflict);
assert.commandFailedWithCode(session1.commitTransaction_forTesting(),
ErrorCodes.NoSuchTransaction);
+
+ session1.startTransaction();
+ assert.commandWorked(session1Coll.runCommand(
+ {find: collName})); // Start finalizing transaction with a no-op.
+ assert.commandWorked(session1.commitTransaction_forTesting());
}
/**