Import wiredtiger: 0dd6ca031291805203db8fcd786615deb3db34dd from branch mongodb-master

ref: 827581cdd6..0dd6ca0312
for: 6.3.0-rc0

WT-10434 Skip log retention setting during backward compatibility runs.

3 files changed, 9 insertions, 4 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index ee6a453843a..0942c00bdc1 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": "827581cdd681a2415960ef3ac7470f17e43f751f"
+    "commit": "0dd6ca031291805203db8fcd786615deb3db34dd"
 }
diff --git a/src/third_party/wiredtiger/test/format/config.sh b/src/third_party/wiredtiger/test/format/config.sh
index 33a1fc5b686..3530f6bdc42 100755
--- a/src/third_party/wiredtiger/test/format/config.sh
+++ b/src/third_party/wiredtiger/test/format/config.sh
@@ -137,11 +137,11 @@ CONFIG configuration_list[] = {
 
 {"checkpoint.wait", "seconds to wait if wiredtiger checkpoints configured", 0x0, 5, 100, 3600}
 
-{"debug.checkpoint_retention", "adjust log removal to retain the log records", 0x0, 0, 128, 1024}
+{"debug.checkpoint_retention", "adjust log removal to retain the log records", 0x0, 0, 10, 1024}
 
 {"debug.eviction", "modify internal algorithms to force history store eviction to happen more aggressively", C_BOOL, 2, 0, 0}
 
-{"debug.log_retention", "adjust log removal to retain at least this number of log files", 0x0, 0, 128, 1024}
+{"debug.log_retention", "adjust log removal to retain at least this number of log files", 0x0, 0, 10, 1024}
 
 {"debug.realloc_exact", "reallocation of memory will only provide the exact amount requested", C_BOOL, 0, 0, 0}
 
diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c
index 45851da73ed..ffe110e39ab 100644
--- a/src/third_party/wiredtiger/test/format/wts.c
+++ b/src/third_party/wiredtiger/test/format/wts.c
@@ -209,7 +209,12 @@ configure_debug_mode(char **p, size_t max)
         CONFIG_APPEND(*p, ",checkpoint_retention=%" PRIu32, GV(DEBUG_CHECKPOINT_RETENTION));
     if (GV(DEBUG_EVICTION))
         CONFIG_APPEND(*p, ",eviction=true");
-    if (GV(DEBUG_LOG_RETENTION) != 0)
+    /*
+     * Don't configure log retention debug mode during backward compatibility mode. Compatibility
+     * requires removing log files on reconfigure. When the version is changed for compatibility,
+     * reconfigure requires removing earlier log files and log retention can make that seem to hang.
+     */
+    if (GV(DEBUG_LOG_RETENTION) != 0 && !g.backward_compatible)
         CONFIG_APPEND(*p, ",log_retention=%" PRIu32, GV(DEBUG_LOG_RETENTION));
     if (GV(DEBUG_REALLOC_EXACT))
         CONFIG_APPEND(*p, ",realloc_exact=true");