Import wiredtiger: 80be8759886a78985fe59a315ad7c7a4acdaee5f from branch mongodb-master

ref: f7aa95cb1b..80be875988
for: 6.1.0-rc0

WT-9472 Unexpected WT_ROLLBACK when inserting data (#8076)

2 files changed, 8 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 745db55be16..88c52ecc581 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "f7aa95cb1b523c76e570c6457d2c70e0c32c6dce"
+    "commit": "80be8759886a78985fe59a315ad7c7a4acdaee5f"
 }
diff --git a/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c b/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c
index 68467dd9468..f23e3777293 100644
--- a/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c
+++ b/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c
@@ -323,6 +323,7 @@ static void
 large_updates(WT_SESSION *session, const char *uri, char *value, int commit_ts)
 {
     WT_CURSOR *cursor;
+    WT_DECL_RET;
     WT_RAND_STATE rnd;
     uint64_t val;
     int i;
@@ -337,8 +338,12 @@ large_updates(WT_SESSION *session, const char *uri, char *value, int commit_ts)
         cursor->set_key(cursor, i + 1);
         val = (uint64_t)__wt_random(&rnd);
         cursor->set_value(cursor, val, val, val, value);
-        testutil_check(cursor->insert(cursor));
-        testutil_check(session->commit_transaction(session, tscfg));
+        if ((ret = cursor->insert(cursor)) == WT_ROLLBACK)
+            testutil_check(session->rollback_transaction(session, NULL));
+        else {
+            testutil_check(ret);
+            testutil_check(session->commit_transaction(session, tscfg));
+        }
     }
 
     testutil_check(cursor->close(cursor));