summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pearson <luke.pearson@mongodb.com>2023-05-03 15:48:47 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2023-05-03 06:28:16 +0000
commitee8027e6dd6f69e59a2013439aa9b1068c42d438 (patch)
tree9462f1fed13b8f04271be22f4fea3a252dbd11b8
parentcbb9e88e93b46ab4df6ab9fcd34abfd19bc2c63f (diff)
downloadmongo-ee8027e6dd6f69e59a2013439aa9b1068c42d438.tar.gz
Import wiredtiger: 46fb8317e1cfbbb72204596065d78d951fc36c82 from branch mongodb-master
ref: 4061ee7289..46fb8317e1 for: 7.1.0-rc0 WT-9545 wt8246_compact_rts_data_correctness test read incorrect data on macOS
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c1
-rwxr-xr-xsrc/third_party/wiredtiger/test/evergreen.yml1
3 files changed, 3 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index c18f3d929fe..96de576bc3f 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": "4061ee7289304fdd594e2b1377bfa432ee6533e1"
+ "commit": "46fb8317e1cfbbb72204596065d78d951fc36c82"
}
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 3e1c0d8b69a..90c24e997ab 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
@@ -340,6 +340,7 @@ large_updates(WT_SESSION *session, const char *uri, char *value, int commit_ts)
val = (uint64_t)__wt_random(&rnd);
cursor->set_value(cursor, val, val, val, value);
while (((ret = cursor->insert(cursor)) == WT_ROLLBACK) && retry_attempts < MAX_RETRIES) {
+ printf("Rollback transaction for key %d\n", i + 1);
testutil_check(session->rollback_transaction(session, NULL));
testutil_check(session->begin_transaction(session, NULL));
++retry_attempts;
diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml
index 05bbb1b1339..3ed98871e7b 100755
--- a/src/third_party/wiredtiger/test/evergreen.yml
+++ b/src/third_party/wiredtiger/test/evergreen.yml
@@ -5660,6 +5660,7 @@ buildvariants:
# Remove that configuration here and let MacOS use the default Xcode toolchain instead.
# We'll explicitly use the python3 in /usr/bin, we use the same in configuring cmake.
CMAKE_TOOLCHAIN_FILE:
+ CC_OPTIMIZE_LEVEL: -DCC_OPTIMIZE_LEVEL=-O0
python_binary: '/usr/bin/python3'
smp_command: -j $(sysctl -n hw.logicalcpu)
cmake_generator: "Unix Makefiles"