diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2024-01-19 13:41:38 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2024-01-19 03:24:43 +0000 |
| commit | 50d2d668f1a7d44690d9af122dd970848b0efb75 (patch) | |
| tree | 625606a078b4d350a8e46511df7dfa3602eff3d2 | |
| parent | f88a0d646c83ac9fbe9bd1879560409ead7e2ce2 (diff) | |
Import wiredtiger: be4538d91a80cd5dbe3a3a78315ba298a71336f0 from branch mongodb-7.2r7.2.1-rc0
ref: db2c6172da..be4538d91a
for: 7.2.1
WT-12110 Disable timestamp_abort backup tests in the compatibility mode
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c | 7 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/csuite/timestamp_abort/smoke.sh | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index f328b2543e4..ea267379cfe 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-7.2", - "commit": "db2c6172daad8abbb797d79bec240191dc292b63" + "commit": "be4538d91a80cd5dbe3a3a78315ba298a71336f0" } diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c index 9a72cb715f2..0862553bb20 100644 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c @@ -1770,6 +1770,13 @@ main(int argc, char *argv[]) */ testutil_parse_end_opt(opts); + /* + * Don't allow testing backups in the compatibility mode. MongoDB no longer uses it, and the + * compatibility mode is inherently incompatible with backup-related fixes that add new log + * records. So disallow the test. + */ + testutil_assert(!(opts->compat && use_backups)); + testutil_work_dir_from_path(home, sizeof(home), opts->home); /* diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/smoke.sh b/src/third_party/wiredtiger/test/csuite/timestamp_abort/smoke.sh index 3194e47f4a2..a47c757efd0 100755 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/smoke.sh +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/smoke.sh @@ -33,6 +33,9 @@ $TEST_WRAPPER $test_bin -m $default_test_args -c #$TEST_WRAPPER $test_bin -m $default_test_args -L $TEST_WRAPPER $test_bin -C $default_test_args $TEST_WRAPPER $test_bin -C $default_test_args -c -$TEST_WRAPPER $test_bin -C $default_test_args -B -I 3 $TEST_WRAPPER $test_bin -C -m $default_test_args $TEST_WRAPPER $test_bin -C -m $default_test_args -c + +# Don't test backups in the compatibility mode. MongoDB no longer uses it, and the compatibility +# mode is inherently incompatible with backup-related fixes that add new log records. +#$TEST_WRAPPER $test_bin -C $default_test_args -B -I 3 |