Import wiredtiger: a69db0c7f3531517cc32b44ba4b6482aea7fddc4 from branch mongodb-master

ref: d4b0ad6cac..a69db0c7f3
for: 6.0.0

WT-8706       Increase the cache size in all test_checkpoint scenarios

4 files changed, 11 insertions, 13 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index ce4b1fd19bd..1991caf833b 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": "d4b0ad6cacb874fdc20bcc76311d789dd5a01441"
+    "commit": "a69db0c7f3531517cc32b44ba4b6482aea7fddc4"
 }
diff --git a/src/third_party/wiredtiger/src/btree/bt_walk.c b/src/third_party/wiredtiger/src/btree/bt_walk.c
index dce4b1843e3..e3ee0c03bf7 100644
--- a/src/third_party/wiredtiger/src/btree/bt_walk.c
+++ b/src/third_party/wiredtiger/src/btree/bt_walk.c
@@ -255,8 +255,7 @@ __tree_walk_internal(WT_SESSION_IMPL *session, WT_REF **refp, uint64_t *walkcntp
     restart_sleep = restart_yield = 0;
     empty_internal = false;
 
-    /* Ensure we have a snapshot to check visibility or we only check global visibility.
-     */
+    /* Ensure we have a snapshot to check visibility or we only check global visibility. */
     WT_ASSERT(session, LF_ISSET(WT_READ_VISIBLE_ALL) || F_ISSET(session->txn, WT_TXN_HAS_SNAPSHOT));
 
     /* All current tree walks skip deleted pages. */
diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
index a864b035563..4c3e84bd8ba 100644
--- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
+++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c
@@ -263,16 +263,15 @@ wt_connect(const char *config_open)
     };
     int ret;
     char config[512];
-    char timing_stress_cofing[512];
+    char timing_stress_config[512];
     bool timing_stress;
 
     timing_stress = false;
-
     if (g.sweep_stress || g.failpoint_hs_delete_key_from_ts || g.failpoint_hs_insert_1 ||
       g.failpoint_hs_insert_2 || g.hs_checkpoint_timing_stress || g.reserved_txnid_timing_stress ||
       g.checkpoint_slow_timing_stress) {
         timing_stress = true;
-        testutil_check(__wt_snprintf(timing_stress_cofing, sizeof(timing_stress_cofing),
+        testutil_check(__wt_snprintf(timing_stress_config, sizeof(timing_stress_config),
           ",timing_stress_for_test=[%s%s%s%s%s]", g.sweep_stress ? "aggressive_sweep" : "",
           g.failpoint_hs_delete_key_from_ts ? "failpoint_history_store_delete_key_from_ts" : "",
           g.hs_checkpoint_timing_stress ? "history_store_checkpoint_delay" : "",
@@ -288,14 +287,14 @@ wt_connect(const char *config_open)
           "create,cache_cursors=false,statistics=(fast),statistics_log=(json,wait=1),error_prefix="
           "\"%s\",file_manager=(close_handle_minimum=1,close_idle_time=1,close_scan_interval=1),"
           "log=(enabled),cache_size=1GB%s%s%s%s",
-          progname, timing_stress_cofing, g.debug_mode ? DEBUG_MODE_CFG : "",
+          progname, timing_stress_config, g.debug_mode ? DEBUG_MODE_CFG : "",
           config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open));
     else {
         testutil_check(__wt_snprintf(config, sizeof(config),
           "create,cache_cursors=false,statistics=(fast),statistics_log=(json,wait=1),log=(enabled),"
-          "error_prefix=\"%s\"%s%s%s%s",
+          "error_prefix=\"%s\",cache_size=1G%s%s%s%s",
           progname, g.debug_mode ? DEBUG_MODE_CFG : "", config_open == NULL ? "" : ",",
-          config_open == NULL ? "" : config_open, timing_stress ? timing_stress_cofing : ""));
+          config_open == NULL ? "" : config_open, timing_stress ? timing_stress_config : ""));
     }
     printf("WT open config: %s\n", config);
     if ((ret = wiredtiger_open(g.home, &event_handler, config, &g.conn)) != 0)
diff --git a/src/third_party/wiredtiger/test/checkpoint/workers.c b/src/third_party/wiredtiger/test/checkpoint/workers.c
index 1c3ac198d88..80f6dbf1e3a 100644
--- a/src/third_party/wiredtiger/test/checkpoint/workers.c
+++ b/src/third_party/wiredtiger/test/checkpoint/workers.c
@@ -272,7 +272,7 @@ worker_op(WT_CURSOR *cursor, table_type type, uint64_t keyno, u_int new_val)
             testutil_check(cursor->reset(cursor));
     } else {
         if (new_val % 39 < 30) {
-            // Do modify
+            /* Do modify. */
             ret = cursor->search(cursor);
             if (ret == 0 && (type != FIX || !cursor_fix_at_zero(cursor))) {
                 modify_build(entries, &nentries, new_val);
@@ -298,7 +298,7 @@ worker_op(WT_CURSOR *cursor, table_type type, uint64_t keyno, u_int new_val)
             }
         }
 
-        // If key doesn't exist, turn modify into an insert.
+        /* If key doesn't exist, turn modify into an insert. */
         testutil_check(__wt_snprintf(valuebuf, sizeof(valuebuf), "%052u", new_val));
         if (type == FIX)
             cursor->set_value(cursor, flcs_encode(valuebuf));
@@ -437,7 +437,7 @@ real_worker(void)
                             testutil_check(__wt_snprintf(
                               buf, sizeof(buf), "commit_timestamp=%" PRIx64, g.ts_stable + 1));
 
-                        // Commit majority of times
+                        /* Commit majority of times. */
                         if (next_rnd % 49 != 0) {
                             if ((ret = session->commit_transaction(session, buf)) != 0) {
                                 __wt_readunlock((WT_SESSION_IMPL *)session, &g.clock_lock);
@@ -458,7 +458,7 @@ real_worker(void)
                             reopen_cursors = true;
                     }
                 } else {
-                    // Commit majority of times
+                    /* Commit majority of times. */
                     if (next_rnd % 49 != 0) {
                         if ((ret = session->commit_transaction(session, NULL)) != 0) {
                             (void)log_print_err("real_worker:commit_transaction", ret, 1);