Import wiredtiger: e440ba4506ddfdabd87fdacfb625da54aa1b3aeb from branch mongodb-master

ref: 753efa984e..e440ba4506
for: 6.2.0-rc0

WT-9381 Remove checkpoint reserved transaction id (#8275)

23 files changed, 59 insertions, 175 deletions

diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py
index a3ac5881c0f..44c03f9d8c2 100644
--- a/src/third_party/wiredtiger/dist/api_data.py
+++ b/src/third_party/wiredtiger/dist/api_data.py
@@ -780,12 +780,13 @@ connection_runtime_config = [
         stress testing of WiredTiger.''',
         type='list', undoc=True,
         choices=[
-        'aggressive_sweep', 'backup_rename', 'checkpoint_evict_page',
-        'checkpoint_reserved_txnid_delay', 'checkpoint_slow', 'checkpoint_stop', 'compact_slow',
-        'evict_reposition', 'failpoint_eviction_fail_after_reconciliation', 
+        'aggressive_sweep', 'backup_rename', 'checkpoint_evict_page', 'checkpoint_slow',
+        'checkpoint_stop', 'compact_slow', 'evict_reposition',
+        'failpoint_eviction_fail_after_reconciliation',
         'failpoint_history_store_delete_key_from_ts', 'history_store_checkpoint_delay',
-        'history_store_search', 'history_store_sweep_race', 'prepare_checkpoint_delay', 'split_1',
-        'split_2', 'split_3', 'split_4', 'split_5', 'split_6', 'split_7', 'tiered_flush_finish']),
+        'history_store_search', 'history_store_sweep_race', 'prepare_checkpoint_delay',
+        'split_1', 'split_2', 'split_3', 'split_4', 'split_5', 'split_6', 'split_7',
+        'tiered_flush_finish']),
     Config('verbose', '[]', r'''
         enable messages for various subsystems and operations. Options are given as a list,
         where each message type can optionally define an associated verbosity level, such as
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 819804ea470..cc878c7ebd1 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": "753efa984e0f7bcf1179066b205d34883abb76aa"
+    "commit": "e440ba4506ddfdabd87fdacfb625da54aa1b3aeb"
 }
diff --git a/src/third_party/wiredtiger/src/config/config_def.c b/src/third_party/wiredtiger/src/config/config_def.c
index c360818b7d4..fcddb47ad76 100644
--- a/src/third_party/wiredtiger/src/config/config_def.c
+++ b/src/third_party/wiredtiger/src/config/config_def.c
@@ -154,9 +154,8 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = {
     confchk_WT_CONNECTION_reconfigure_tiered_storage_subconfigs, 1},
   {"timing_stress_for_test", "list", NULL,
     "choices=[\"aggressive_sweep\",\"backup_rename\","
-    "\"checkpoint_evict_page\",\"checkpoint_reserved_txnid_delay\","
-    "\"checkpoint_slow\",\"checkpoint_stop\",\"compact_slow\","
-    "\"evict_reposition\","
+    "\"checkpoint_evict_page\",\"checkpoint_slow\","
+    "\"checkpoint_stop\",\"compact_slow\",\"evict_reposition\","
     "\"failpoint_eviction_fail_after_reconciliation\","
     "\"failpoint_history_store_delete_key_from_ts\","
     "\"history_store_checkpoint_delay\",\"history_store_search\","
@@ -897,9 +896,8 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = {
   {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7},
   {"timing_stress_for_test", "list", NULL,
     "choices=[\"aggressive_sweep\",\"backup_rename\","
-    "\"checkpoint_evict_page\",\"checkpoint_reserved_txnid_delay\","
-    "\"checkpoint_slow\",\"checkpoint_stop\",\"compact_slow\","
-    "\"evict_reposition\","
+    "\"checkpoint_evict_page\",\"checkpoint_slow\","
+    "\"checkpoint_stop\",\"compact_slow\",\"evict_reposition\","
     "\"failpoint_eviction_fail_after_reconciliation\","
     "\"failpoint_history_store_delete_key_from_ts\","
     "\"history_store_checkpoint_delay\",\"history_store_search\","
@@ -982,9 +980,8 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = {
   {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7},
   {"timing_stress_for_test", "list", NULL,
     "choices=[\"aggressive_sweep\",\"backup_rename\","
-    "\"checkpoint_evict_page\",\"checkpoint_reserved_txnid_delay\","
-    "\"checkpoint_slow\",\"checkpoint_stop\",\"compact_slow\","
-    "\"evict_reposition\","
+    "\"checkpoint_evict_page\",\"checkpoint_slow\","
+    "\"checkpoint_stop\",\"compact_slow\",\"evict_reposition\","
     "\"failpoint_eviction_fail_after_reconciliation\","
     "\"failpoint_history_store_delete_key_from_ts\","
     "\"history_store_checkpoint_delay\",\"history_store_search\","
@@ -1065,9 +1062,8 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = {
   {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7},
   {"timing_stress_for_test", "list", NULL,
     "choices=[\"aggressive_sweep\",\"backup_rename\","
-    "\"checkpoint_evict_page\",\"checkpoint_reserved_txnid_delay\","
-    "\"checkpoint_slow\",\"checkpoint_stop\",\"compact_slow\","
-    "\"evict_reposition\","
+    "\"checkpoint_evict_page\",\"checkpoint_slow\","
+    "\"checkpoint_stop\",\"compact_slow\",\"evict_reposition\","
     "\"failpoint_eviction_fail_after_reconciliation\","
     "\"failpoint_history_store_delete_key_from_ts\","
     "\"history_store_checkpoint_delay\",\"history_store_search\","
@@ -1146,9 +1142,8 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = {
   {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7},
   {"timing_stress_for_test", "list", NULL,
     "choices=[\"aggressive_sweep\",\"backup_rename\","
-    "\"checkpoint_evict_page\",\"checkpoint_reserved_txnid_delay\","
-    "\"checkpoint_slow\",\"checkpoint_stop\",\"compact_slow\","
-    "\"evict_reposition\","
+    "\"checkpoint_evict_page\",\"checkpoint_slow\","
+    "\"checkpoint_stop\",\"compact_slow\",\"evict_reposition\","
     "\"failpoint_eviction_fail_after_reconciliation\","
     "\"failpoint_history_store_delete_key_from_ts\","
     "\"history_store_checkpoint_delay\",\"history_store_search\","
diff --git a/src/third_party/wiredtiger/src/conn/conn_api.c b/src/third_party/wiredtiger/src/conn/conn_api.c
index c40399357ab..eb43ab1ab82 100644
--- a/src/third_party/wiredtiger/src/conn/conn_api.c
+++ b/src/third_party/wiredtiger/src/conn/conn_api.c
@@ -2249,7 +2249,6 @@ __wt_timing_stress_config(WT_SESSION_IMPL *session, const char *cfg[])
       {"aggressive_sweep", WT_TIMING_STRESS_AGGRESSIVE_SWEEP},
       {"backup_rename", WT_TIMING_STRESS_BACKUP_RENAME},
       {"checkpoint_evict_page", WT_TIMING_STRESS_CHECKPOINT_EVICT_PAGE},
-      {"checkpoint_reserved_txnid_delay", WT_TIMING_STRESS_CHECKPOINT_RESERVED_TXNID_DELAY},
       {"checkpoint_slow", WT_TIMING_STRESS_CHECKPOINT_SLOW},
       {"checkpoint_stop", WT_TIMING_STRESS_CHECKPOINT_STOP},
       {"compact_slow", WT_TIMING_STRESS_COMPACT_SLOW},
diff --git a/src/third_party/wiredtiger/src/conn/conn_ckpt.c b/src/third_party/wiredtiger/src/conn/conn_ckpt.c
index 221de9ffe54..7ac53585134 100644
--- a/src/third_party/wiredtiger/src/conn/conn_ckpt.c
+++ b/src/third_party/wiredtiger/src/conn/conn_ckpt.c
@@ -240,40 +240,3 @@ __wt_checkpoint_signal(WT_SESSION_IMPL *session, wt_off_t logsize)
         conn->ckpt_signalled = true;
     }
 }
-
-/*
- * __wt_checkpoint_reserved_session_init --
- *     Initialize checkpoint reserved session.
- */
-int
-__wt_checkpoint_reserved_session_init(WT_SESSION_IMPL *session)
-{
-    WT_CONNECTION_IMPL *conn;
-
-    conn = S2C(session);
-
-    WT_ASSERT(session, conn->ckpt_reserved_session == NULL);
-
-    return (__wt_open_internal_session(
-      conn, "ckpt-reserved", false, WT_SESSION_NO_RECONCILE, 0, &conn->ckpt_reserved_session));
-}
-
-/*
- * __wt_checkpoint_reserved_session_destroy --
- *     Release resources allocated for checkpoint reserved session.
- */
-int
-__wt_checkpoint_reserved_session_destroy(WT_SESSION_IMPL *session)
-{
-    WT_CONNECTION_IMPL *conn;
-    WT_DECL_RET;
-
-    conn = S2C(session);
-
-    if (conn->ckpt_reserved_session != NULL) {
-        WT_TRET(__wt_session_close_internal(conn->ckpt_reserved_session));
-        conn->ckpt_reserved_session = NULL;
-    }
-
-    return (ret);
-}
diff --git a/src/third_party/wiredtiger/src/conn/conn_open.c b/src/third_party/wiredtiger/src/conn/conn_open.c
index a6487ab772f..322c7ba6b50 100644
--- a/src/third_party/wiredtiger/src/conn/conn_open.c
+++ b/src/third_party/wiredtiger/src/conn/conn_open.c
@@ -104,9 +104,6 @@ __wt_connection_close(WT_CONNECTION_IMPL *conn)
     /* Close open data handles. */
     WT_TRET(__wt_conn_dhandle_discard(session));
 
-    /* Close the checkpoint reserved session. */
-    WT_TRET(__wt_checkpoint_reserved_session_destroy(session));
-
     /* Shut down metadata tracking. */
     WT_TRET(__wt_meta_track_destroy(session));
 
@@ -248,9 +245,6 @@ __wt_connection_workers(WT_SESSION_IMPL *session, const char *cfg[])
     /* Start the optional capacity thread. */
     WT_RET(__wt_capacity_server_create(session, cfg));
 
-    /* Initialize checkpoint reserved session, required for the checkpoint operation. */
-    WT_RET(__wt_checkpoint_reserved_session_init(session));
-
     /* Start the optional checkpoint thread. */
     WT_RET(__wt_checkpoint_server_create(session, cfg));
 
diff --git a/src/third_party/wiredtiger/src/include/connection.h b/src/third_party/wiredtiger/src/include/connection.h
index fceecced755..18d5ddd6e73 100644
--- a/src/third_party/wiredtiger/src/include/connection.h
+++ b/src/third_party/wiredtiger/src/include/connection.h
@@ -496,8 +496,7 @@ struct __wt_connection_impl {
     uint16_t log_req_min;                  /* Min required log version */
     uint32_t txn_logsync;                  /* Log sync configuration */
 
-    WT_SESSION_IMPL *meta_ckpt_session;     /* Metadata checkpoint session */
-    WT_SESSION_IMPL *ckpt_reserved_session; /* Checkpoint reserved session */
+    WT_SESSION_IMPL *meta_ckpt_session; /* Metadata checkpoint session */
 
     /*
      * Is there a data/schema change that needs to be the part of a checkpoint.
@@ -590,25 +589,24 @@ struct __wt_connection_impl {
 #define WT_TIMING_STRESS_AGGRESSIVE_SWEEP 0x000001u
 #define WT_TIMING_STRESS_BACKUP_RENAME 0x000002u
 #define WT_TIMING_STRESS_CHECKPOINT_EVICT_PAGE 0x000004u
-#define WT_TIMING_STRESS_CHECKPOINT_RESERVED_TXNID_DELAY 0x000008u
-#define WT_TIMING_STRESS_CHECKPOINT_SLOW 0x000010u
-#define WT_TIMING_STRESS_CHECKPOINT_STOP 0x000020u
-#define WT_TIMING_STRESS_COMPACT_SLOW 0x000040u
-#define WT_TIMING_STRESS_EVICT_REPOSITION 0x000080u
-#define WT_TIMING_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 0x000100u
-#define WT_TIMING_STRESS_FAILPOINT_HISTORY_STORE_DELETE_KEY_FROM_TS 0x000200u
-#define WT_TIMING_STRESS_HS_CHECKPOINT_DELAY 0x000400u
-#define WT_TIMING_STRESS_HS_SEARCH 0x000800u
-#define WT_TIMING_STRESS_HS_SWEEP 0x001000u
-#define WT_TIMING_STRESS_PREPARE_CHECKPOINT_DELAY 0x002000u
-#define WT_TIMING_STRESS_SPLIT_1 0x004000u
-#define WT_TIMING_STRESS_SPLIT_2 0x008000u
-#define WT_TIMING_STRESS_SPLIT_3 0x010000u
-#define WT_TIMING_STRESS_SPLIT_4 0x020000u
-#define WT_TIMING_STRESS_SPLIT_5 0x040000u
-#define WT_TIMING_STRESS_SPLIT_6 0x080000u
-#define WT_TIMING_STRESS_SPLIT_7 0x100000u
-#define WT_TIMING_STRESS_TIERED_FLUSH_FINISH 0x200000u
+#define WT_TIMING_STRESS_CHECKPOINT_SLOW 0x000008u
+#define WT_TIMING_STRESS_CHECKPOINT_STOP 0x000010u
+#define WT_TIMING_STRESS_COMPACT_SLOW 0x000020u
+#define WT_TIMING_STRESS_EVICT_REPOSITION 0x000040u
+#define WT_TIMING_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 0x000080u
+#define WT_TIMING_STRESS_FAILPOINT_HISTORY_STORE_DELETE_KEY_FROM_TS 0x000100u
+#define WT_TIMING_STRESS_HS_CHECKPOINT_DELAY 0x000200u
+#define WT_TIMING_STRESS_HS_SEARCH 0x000400u
+#define WT_TIMING_STRESS_HS_SWEEP 0x000800u
+#define WT_TIMING_STRESS_PREPARE_CHECKPOINT_DELAY 0x001000u
+#define WT_TIMING_STRESS_SPLIT_1 0x002000u
+#define WT_TIMING_STRESS_SPLIT_2 0x004000u
+#define WT_TIMING_STRESS_SPLIT_3 0x008000u
+#define WT_TIMING_STRESS_SPLIT_4 0x010000u
+#define WT_TIMING_STRESS_SPLIT_5 0x020000u
+#define WT_TIMING_STRESS_SPLIT_6 0x040000u
+#define WT_TIMING_STRESS_SPLIT_7 0x080000u
+#define WT_TIMING_STRESS_TIERED_FLUSH_FINISH 0x100000u
     /* AUTOMATIC FLAG VALUE GENERATION STOP 32 */
     uint32_t timing_stress_flags;
 
diff --git a/src/third_party/wiredtiger/src/include/extern.h b/src/third_party/wiredtiger/src/include/extern.h
index 8b88c33c7f8..06b470ad408 100644
--- a/src/third_party/wiredtiger/src/include/extern.h
+++ b/src/third_party/wiredtiger/src/include/extern.h
@@ -361,10 +361,6 @@ extern int __wt_checkpoint_close(WT_SESSION_IMPL *session, bool final)
   WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_checkpoint_get_handles(WT_SESSION_IMPL *session, const char *cfg[])
   WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_checkpoint_reserved_session_destroy(WT_SESSION_IMPL *session)
-  WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
-extern int __wt_checkpoint_reserved_session_init(WT_SESSION_IMPL *session)
-  WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_checkpoint_server_create(WT_SESSION_IMPL *session, const char *cfg[])
   WT_GCC_FUNC_DECL_ATTRIBUTE((warn_unused_result));
 extern int __wt_checkpoint_server_destroy(WT_SESSION_IMPL *session)
diff --git a/src/third_party/wiredtiger/src/include/txn.h b/src/third_party/wiredtiger/src/include/txn.h
index d9044db4e1d..d1ede81e211 100644
--- a/src/third_party/wiredtiger/src/include/txn.h
+++ b/src/third_party/wiredtiger/src/include/txn.h
@@ -164,8 +164,6 @@ struct __wt_txn_global {
     volatile uint32_t checkpoint_id;     /* Checkpoint's session ID */
     WT_TXN_SHARED checkpoint_txn_shared; /* Checkpoint's txn shared state */
     wt_timestamp_t checkpoint_timestamp; /* Checkpoint's timestamp */
-    volatile uint64_t checkpoint_reserved_txn_id; /* A transaction ID reserved by checkpoint for
-                                            prepared transaction resolution. */
 
     volatile uint64_t debug_ops;       /* Debug mode op counter */
     uint64_t debug_rollback;           /* Debug mode rollback */
diff --git a/src/third_party/wiredtiger/src/txn/txn_ckpt.c b/src/third_party/wiredtiger/src/txn/txn_ckpt.c
index 4f54aa18030..2ba49278282 100644
--- a/src/third_party/wiredtiger/src/txn/txn_ckpt.c
+++ b/src/third_party/wiredtiger/src/txn/txn_ckpt.c
@@ -631,34 +631,6 @@ __checkpoint_prepare(WT_SESSION_IMPL *session, bool *trackingp, const char *cfg[
     __wt_writeunlock(session, &txn_global->rwlock);
 
     /*
-     * Allocate a reserved transaction id that will be used for removing history entries when a
-     * prepare transaction rollback occurs in parallel to a checkpoint. Ensure that this transaction
-     * id is published before taking the checkpoint's snapshot.
-     *
-     * Other alternatives to solve the issue is by using a transaction id that is allocated after
-     * the second checkpoint snapshot. This approach has issues of using a stale reserved
-     * transaction id for the history store updates and the data store page is skipped in the
-     * checkpoint. To address the use of stale reserved transaction id, all the data store pages
-     * that have restored prepared updates need to get checkpointed forcefully.
-     *
-     * The checkpoint snapshot max can also be used for this purpose, instead of allocating a new
-     * reserved transaction id. This solution also have to force all the pages with restored
-     * prepared updates to be part of the current checkpoint. Therefore, we think it is better to
-     * use a dedicated transaction id as the checkpoint snapshot max is allocated to a session and
-     * used for other operations can lead to confusion when an issue occurs.
-     */
-    if (conn->ckpt_reserved_session != NULL) {
-        WT_RET(__wt_txn_begin(conn->ckpt_reserved_session, NULL));
-        WT_ERR(__wt_txn_id_check(conn->ckpt_reserved_session));
-        txn_global->checkpoint_reserved_txn_id = conn->ckpt_reserved_session->txn->id;
-
-        /* Add a one second wait to simulate reserved transaction id race with prepared rollback. */
-        tsp.tv_sec = 1;
-        tsp.tv_nsec = 0;
-        __checkpoint_timing_stress(session, WT_TIMING_STRESS_CHECKPOINT_RESERVED_TXNID_DELAY, &tsp);
-    }
-
-    /*
      * Refresh our snapshot here without publishing our shared ids to the world, doing so prevents
      * us from racing with the stable timestamp moving ahead of current snapshot. i.e. if the stable
      * timestamp moves after we begin the checkpoint transaction but before we set the checkpoint
@@ -671,13 +643,6 @@ __checkpoint_prepare(WT_SESSION_IMPL *session, bool *trackingp, const char *cfg[
     /* Flag as unused for non diagnostic builds. */
     WT_UNUSED(original_snap_min);
 
-    /* Assert that the checkpoint reserved transaction id not visible in the checkpoint snapshot. */
-    WT_ASSERT(session,
-      conn->ckpt_reserved_session == NULL ||
-        !__wt_txn_visible_id_snapshot(txn_global->checkpoint_reserved_txn_id,
-          session->txn->snap_min, session->txn->snap_max, session->txn->snapshot,
-          session->txn->snapshot_count));
-
     if (use_timestamp)
         __wt_verbose_timestamp(
           session, txn_global->checkpoint_timestamp, "Checkpoint requested at stable timestamp");
@@ -696,9 +661,6 @@ __checkpoint_prepare(WT_SESSION_IMPL *session, bool *trackingp, const char *cfg[
     __wt_epoch(session, &conn->ckpt_prep_end);
     WT_STAT_CONN_SET(session, txn_checkpoint_prep_running, 0);
 
-err:
-    if (conn->ckpt_reserved_session != NULL)
-        __wt_txn_release(conn->ckpt_reserved_session);
     return (ret);
 }
 
diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
index 02875212112..3ffeb0bf262 100644
--- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
+++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
@@ -71,7 +71,7 @@ main(int argc, char *argv[])
     g.sweep_stress = g.use_timestamps = false;
     g.failpoint_eviction_fail_after_reconciliation = false;
     g.failpoint_hs_delete_key_from_ts = false;
-    g.hs_checkpoint_timing_stress = g.reserved_txnid_timing_stress = false;
+    g.hs_checkpoint_timing_stress = false;
     g.checkpoint_slow_timing_stress = false;
     g.no_ts_deletes = false;
     runs = 1;
@@ -126,9 +126,6 @@ main(int argc, char *argv[])
             case '3':
                 g.hs_checkpoint_timing_stress = true;
                 break;
-            case '4':
-                g.reserved_txnid_timing_stress = true;
-                break;
             case '5':
                 g.checkpoint_slow_timing_stress = true;
                 break;
@@ -305,9 +302,8 @@ wt_connect(const char *config_open)
 
     if (g.evict_reposition_timing_stress || g.sweep_stress ||
       g.failpoint_eviction_fail_after_reconciliation || g.failpoint_hs_delete_key_from_ts ||
-      g.hs_checkpoint_timing_stress || g.reserved_txnid_timing_stress ||
-      g.checkpoint_slow_timing_stress) {
-        testutil_check(__wt_snprintf(buf, sizeof(buf), ",timing_stress_for_test=[%s%s%s%s%s%s%s]",
+      g.hs_checkpoint_timing_stress || g.checkpoint_slow_timing_stress) {
+        testutil_check(__wt_snprintf(buf, sizeof(buf), ",timing_stress_for_test=[%s%s%s%s%s%s]",
           g.checkpoint_slow_timing_stress ? "checkpoint_slow" : "",
           g.evict_reposition_timing_stress ? "evict_reposition" : "",
           g.failpoint_eviction_fail_after_reconciliation ?
@@ -315,7 +311,6 @@ wt_connect(const char *config_open)
             "",
           g.failpoint_hs_delete_key_from_ts ? "failpoint_history_store_delete_key_from_ts" : "",
           g.hs_checkpoint_timing_stress ? "history_store_checkpoint_delay" : "",
-          g.reserved_txnid_timing_stress ? "checkpoint_reserved_txnid_delay" : "",
           g.sweep_stress ? "aggressive_sweep" : ""));
         strcat(config, buf);
     }
@@ -626,7 +621,6 @@ usage(void)
       "\t\t1: sweep_stress\n"
       "\t\t2: failpoint_hs_delete_key_from_ts\n"
       "\t\t3: hs_checkpoint_timing_stress\n"
-      "\t\t4: reserved_txnid_timing_stress\n"
       "\t\t5: checkpoint_slow_timing_stress\n"
       "\t\t6: evict_reposition_timing_stress\n"
       "\t\t7: failpoint_eviction_fail_after_reconciliation\n"
diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
index 42748f7c597..1c3e0531619 100644
--- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
+++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.h
@@ -71,7 +71,6 @@ typedef struct {
     bool checkpoint_slow_timing_stress;  /* Checkpoint slow timing stress */
     bool evict_reposition_timing_stress; /* Reposition the cursor for read operations */
     bool hs_checkpoint_timing_stress;    /* History store checkpoint timing stress */
-    bool reserved_txnid_timing_stress;   /* Reserved transaction id timing stress */
     bool sweep_stress;                   /* Sweep stress test */
 
     uint64_t ts_oldest;                                /* Current oldest timestamp */
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index 7f27a54459e..e54e0960d07 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -517,7 +517,6 @@ config_backward_compatible(void)
 
     BC_CHECK("disk.mmap_all", DISK_MMAP_ALL);
     BC_CHECK("block_cache", BLOCK_CACHE);
-    BC_CHECK("stress.checkpoint_reserved_txnid_delay", STRESS_CHECKPOINT_RESERVED_TXNID_DELAY);
     BC_CHECK("stress.hs_checkpoint_delay", STRESS_HS_CHECKPOINT_DELAY);
     BC_CHECK("stress.hs_search", STRESS_HS_SEARCH);
     BC_CHECK("stress.hs_sweep", STRESS_HS_SWEEP);
diff --git a/src/third_party/wiredtiger/test/format/config.h b/src/third_party/wiredtiger/test/format/config.h
index 48344963cb3..a7c3c863fdd 100644
--- a/src/third_party/wiredtiger/test/format/config.h
+++ b/src/third_party/wiredtiger/test/format/config.h
@@ -114,25 +114,24 @@ typedef struct {
 #define V_GLOBAL_STRESS_AGGRESSIVE_SWEEP 82
 #define V_GLOBAL_STRESS_CHECKPOINT 83
 #define V_GLOBAL_STRESS_CHECKPOINT_EVICT_PAGE 84
-#define V_GLOBAL_STRESS_CHECKPOINT_RESERVED_TXNID_DELAY 85
-#define V_GLOBAL_STRESS_CHECKPOINT_PREPARE 86
-#define V_GLOBAL_STRESS_EVICT_REPOSITION 87
-#define V_GLOBAL_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 88
-#define V_GLOBAL_STRESS_FAILPOINT_HS_DELETE_KEY_FROM_TS 89
-#define V_GLOBAL_STRESS_HS_CHECKPOINT_DELAY 90
-#define V_GLOBAL_STRESS_HS_SEARCH 91
-#define V_GLOBAL_STRESS_HS_SWEEP 92
-#define V_GLOBAL_STRESS_SPLIT_1 93
-#define V_GLOBAL_STRESS_SPLIT_2 94
-#define V_GLOBAL_STRESS_SPLIT_3 95
-#define V_GLOBAL_STRESS_SPLIT_4 96
-#define V_GLOBAL_STRESS_SPLIT_5 97
-#define V_GLOBAL_STRESS_SPLIT_6 98
-#define V_GLOBAL_STRESS_SPLIT_7 99
-#define V_GLOBAL_TRANSACTION_IMPLICIT 100
-#define V_GLOBAL_TRANSACTION_TIMESTAMPS 101
-#define V_GLOBAL_WIREDTIGER_CONFIG 102
-#define V_GLOBAL_WIREDTIGER_RWLOCK 103
-#define V_GLOBAL_WIREDTIGER_LEAK_MEMORY 104
+#define V_GLOBAL_STRESS_CHECKPOINT_PREPARE 85
+#define V_GLOBAL_STRESS_EVICT_REPOSITION 86
+#define V_GLOBAL_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 87
+#define V_GLOBAL_STRESS_FAILPOINT_HS_DELETE_KEY_FROM_TS 88
+#define V_GLOBAL_STRESS_HS_CHECKPOINT_DELAY 89
+#define V_GLOBAL_STRESS_HS_SEARCH 90
+#define V_GLOBAL_STRESS_HS_SWEEP 91
+#define V_GLOBAL_STRESS_SPLIT_1 92
+#define V_GLOBAL_STRESS_SPLIT_2 93
+#define V_GLOBAL_STRESS_SPLIT_3 94
+#define V_GLOBAL_STRESS_SPLIT_4 95
+#define V_GLOBAL_STRESS_SPLIT_5 96
+#define V_GLOBAL_STRESS_SPLIT_6 97
+#define V_GLOBAL_STRESS_SPLIT_7 98
+#define V_GLOBAL_TRANSACTION_IMPLICIT 99
+#define V_GLOBAL_TRANSACTION_TIMESTAMPS 100
+#define V_GLOBAL_WIREDTIGER_CONFIG 101
+#define V_GLOBAL_WIREDTIGER_RWLOCK 102
+#define V_GLOBAL_WIREDTIGER_LEAK_MEMORY 103
 
-#define V_ELEMENT_COUNT 105
+#define V_ELEMENT_COUNT 104
diff --git a/src/third_party/wiredtiger/test/format/config.sh b/src/third_party/wiredtiger/test/format/config.sh
index dd87cbc98f6..6f96518e2c8 100755
--- a/src/third_party/wiredtiger/test/format/config.sh
+++ b/src/third_party/wiredtiger/test/format/config.sh
@@ -244,8 +244,6 @@ CONFIG configuration_list[] = {
 
 {"stress.checkpoint_evict_page", "stress force checkpoint to evict all reconciling pages", C_BOOL, 2, 0, 0}
 
-{"stress.checkpoint_reserved_txnid_delay", "stress checkpoint invisible transaction id delay", C_BOOL, 2, 0, 0}
-
 {"stress.checkpoint_prepare", "stress checkpoint prepare", C_BOOL, 2, 0, 0}
 
 {"stress.evict_reposition", "stress evict reposition", C_BOOL, 2, 0, 0}
diff --git a/src/third_party/wiredtiger/test/format/config_def.c b/src/third_party/wiredtiger/test/format/config_def.c
index c3487554403..f16cb9f0192 100644
--- a/src/third_party/wiredtiger/test/format/config_def.c
+++ b/src/third_party/wiredtiger/test/format/config_def.c
@@ -263,9 +263,6 @@ CONFIG configuration_list[] = {
   {"stress.checkpoint_evict_page", "stress force checkpoint to evict all reconciling pages",
     C_BOOL, 2, 0, 0, V_GLOBAL_STRESS_CHECKPOINT_EVICT_PAGE},
 
-  {"stress.checkpoint_reserved_txnid_delay", "stress checkpoint invisible transaction id delay",
-    C_BOOL, 2, 0, 0, V_GLOBAL_STRESS_CHECKPOINT_RESERVED_TXNID_DELAY},
-
   {"stress.checkpoint_prepare", "stress checkpoint prepare",
     C_BOOL, 2, 0, 0, V_GLOBAL_STRESS_CHECKPOINT_PREPARE},
 
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234
index 6aa67f4fddf..a18a053a496 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234
@@ -78,7 +78,6 @@ runs.verify_failure_dump=0
 statistics.server=0
 stress.aggressive_sweep=0
 stress.checkpoint=0
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.failpoint_hs_delete_key_from_ts=0
 stress.hs_checkpoint_delay=0
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477
index 56be92802a3..b8360d5bbbd 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477
@@ -50,7 +50,6 @@ statistics.server=0
 stress.aggressive_sweep=0
 stress.checkpoint=0
 stress.checkpoint_evict_page=1
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.evict_reposition=0
 stress.failpoint_hs_delete_key_from_ts=1
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751
index e055a500f98..68f8457ec9b 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751
@@ -52,7 +52,6 @@ statistics.server=1
 stress.aggressive_sweep=0
 stress.checkpoint=0
 stress.checkpoint_evict_page=0
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.evict_reposition=0
 stress.failpoint_eviction_fail_after_reconciliation=1
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772
index 0024c897471..39a8f6416cc 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772
@@ -49,7 +49,6 @@ statistics.server=0
 stress.aggressive_sweep=0
 stress.checkpoint=0
 stress.checkpoint_evict_page=0
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.evict_reposition=0
 stress.failpoint_eviction_fail_after_reconciliation=1
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792
index 7d4d3915491..4ff174cdb9e 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792
@@ -49,7 +49,6 @@ statistics.server=0
 stress.aggressive_sweep=0
 stress.checkpoint=0
 stress.checkpoint_evict_page=0
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.evict_reposition=1
 stress.failpoint_eviction_fail_after_reconciliation=0
diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805
index 0182ec60df8..293e55be470 100644
--- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805
+++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805
@@ -49,7 +49,6 @@ statistics.server=0
 stress.aggressive_sweep=0
 stress.checkpoint=0
 stress.checkpoint_evict_page=0
-stress.checkpoint_reserved_txnid_delay=0
 stress.checkpoint_prepare=0
 stress.evict_reposition=0
 stress.failpoint_eviction_fail_after_reconciliation=1
diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c
index 7c74b4d1fdb..14417ff309f 100644
--- a/src/third_party/wiredtiger/test/format/wts.c
+++ b/src/third_party/wiredtiger/test/format/wts.c
@@ -167,8 +167,6 @@ configure_timing_stress(char **p, size_t max)
         CONFIG_APPEND(*p, ",checkpoint_evict_page");
     if (GV(STRESS_CHECKPOINT_PREPARE))
         CONFIG_APPEND(*p, ",prepare_checkpoint_delay");
-    if (GV(STRESS_CHECKPOINT_RESERVED_TXNID_DELAY))
-        CONFIG_APPEND(*p, ",checkpoint_reserved_txnid_delay");
     if (GV(STRESS_EVICT_REPOSITION))
         CONFIG_APPEND(*p, ",evict_reposition");
     if (GV(STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION))