Import wiredtiger: 2861a1165302d7a2ddf7b384922b2a022cc23897 from branch mongodb-6.1

ref: 42ee89096f..2861a11653
for: 6.1.0-rc1

WT-9771 Fix generating incompatible transaction configurations (#8224)

4 files changed, 27 insertions, 14 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 31de7173990..bc27075eab8 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-6.1",
-    "commit": "42ee89096f8306dbdcbd1a9416c308cf2e0ccf7e"
+    "commit": "2861a1165302d7a2ddf7b384922b2a022cc23897"
 }
diff --git a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh
index d06c66b5e17..2cf49abec52 100755
--- a/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh
+++ b/src/third_party/wiredtiger/test/evergreen/compatibility_test_for_releases.sh
@@ -440,9 +440,6 @@ upgrade_downgrade()
     echo "Upgrade/downgrade testing with \"$1\" and \"$2\""
     echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-="
 
-    cfg_file_branch1=$(get_config_file_name $1)
-    cfg_file_branch2=$(get_config_file_name $2)
-
     format_dir_branch1="$1/build/test/format"
     format_dir_branch2="$2/build/test/format"
 
@@ -454,12 +451,12 @@ upgrade_downgrade()
             echo "$1 format running on $2 access method $am..."
             cd "$top/$format_dir_branch1"
             flags="-1Rq $(bflag $1)"
-            ./t $flags -c "$top/$format_dir_branch2/${cfg_file_branch1}" -h "$top/$format_dir_branch2/RUNDIR.$am" timer=2
+            ./t $flags -h "$top/$format_dir_branch2/RUNDIR.$am" timer=2
 
             echo "$2 format running on $2 access method $am..."
             cd "$top/$format_dir_branch2"
             flags="-1Rq $(bflag $2)"
-            ./t $flags -c $cfg_file_branch2 -h "RUNDIR.$am" timer=2
+            ./t $flags -h "RUNDIR.$am" timer=2
         done
     done
 }
diff --git a/src/third_party/wiredtiger/test/format/config.c b/src/third_party/wiredtiger/test/format/config.c
index 6730fd70110..ffba5bc1028 100644
--- a/src/third_party/wiredtiger/test/format/config.c
+++ b/src/third_party/wiredtiger/test/format/config.c
@@ -1167,30 +1167,36 @@ config_transaction(void)
         config_single(NULL, "transaction.timestamps=on", false);
         config_off(NULL, "transaction.implicit");
         config_off(NULL, "ops.salvage");
-    } else if (GV(TRANSACTION_TIMESTAMPS) && config_explicit(NULL, "transaction.timestamps")) {
+    }
+    if (GV(TRANSACTION_TIMESTAMPS) && config_explicit(NULL, "transaction.timestamps")) {
         config_off(NULL, "transaction.implicit");
         config_off(NULL, "ops.salvage");
         config_off(NULL, "logging");
-    } else if (!GV(TRANSACTION_TIMESTAMPS) && config_explicit(NULL, "transaction.timestamps")) {
+    }
+    if (!GV(TRANSACTION_TIMESTAMPS) && config_explicit(NULL, "transaction.timestamps"))
         config_off(NULL, "ops.prepare");
-    } else if (GV(TRANSACTION_IMPLICIT) && config_explicit(NULL, "transaction.implicit")) {
+    if (GV(TRANSACTION_IMPLICIT) && config_explicit(NULL, "transaction.implicit")) {
         config_off(NULL, "transaction.timestamps");
         config_off(NULL, "ops.prepare");
-    } else if (GV(LOGGING) && config_explicit(NULL, "logging")) {
+    }
+    if (GV(LOGGING) && config_explicit(NULL, "logging"))
         config_off(NULL, "ops.prepare");
-    } else if (GV(OPS_SALVAGE) && config_explicit(NULL, "ops.salvage")) { /* FIXME WT-6431 */
+    if (GV(OPS_SALVAGE) && config_explicit(NULL, "ops.salvage")) { /* FIXME WT-6431 */
         config_off(NULL, "transaction.timestamps");
         config_off(NULL, "ops.prepare");
-    } else if (GV(OPS_PREPARE)) {
+    }
+    if (GV(OPS_PREPARE)) {
         config_off(NULL, "logging");
         config_single(NULL, "transaction.timestamps=on", false);
         config_off(NULL, "transaction.implicit");
         config_off(NULL, "ops.salvage");
-    } else if (GV(TRANSACTION_TIMESTAMPS)) {
+    }
+    if (GV(TRANSACTION_TIMESTAMPS)) {
         config_off(NULL, "transaction.implicit");
         config_off(NULL, "ops.salvage");
         config_off(NULL, "logging");
-    } else if (!GV(TRANSACTION_TIMESTAMPS))
+    }
+    if (!GV(TRANSACTION_TIMESTAMPS))
         config_off(NULL, "ops.prepare");
 
     g.transaction_timestamps_config = GV(TRANSACTION_TIMESTAMPS) != 0;
diff --git a/src/third_party/wiredtiger/test/format/t.c b/src/third_party/wiredtiger/test/format/t.c
index d101c66e404..b7d149d7ccd 100644
--- a/src/third_party/wiredtiger/test/format/t.c
+++ b/src/third_party/wiredtiger/test/format/t.c
@@ -277,6 +277,16 @@ main(int argc, char *argv[])
     if (g.reopen) {
         if (access(g.home_config, R_OK) != 0)
             testutil_die(ENOENT, "%s", g.home_config);
+
+        /*
+         * The test uses an existing config file in the home directory and ignores the provided
+         * config file during reopen. Log the new config file that is used.
+         */
+        if (config != NULL && strcmp(config, g.home_config) != 0) {
+            printf(
+              "Provided configuration file is ignored. %s config file is used.\n", g.home_config);
+            fflush(stdout);
+        }
         config = g.home_config;
     }
     if (config == NULL && access("CONFIG", R_OK) == 0)