From b7c54a96577a1d5cd888d58679995d940e8888d5 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Tue, 11 Jan 2022 16:21:47 +1100 Subject: Import wiredtiger: 0e2a0ee55ec84aeced65e6f8d6fa494c88c69ac3 from branch mongodb-5.2 ref: d965f4567e..0e2a0ee55e for: 5.2.0-rc5 WT-8437 Do not copy database in wt8246_compact_rts_data_correctness --- src/third_party/wiredtiger/import.data | 2 +- .../wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c | 4 ---- src/third_party/wiredtiger/test/utility/misc.c | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 9e6bd161cbd..acf1356d5df 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-5.2", - "commit": "d965f4567ecc7963ed29bcc5902be2560d6283bf" + "commit": "0e2a0ee55ec84aeced65e6f8d6fa494c88c69ac3" } 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 d11e3781317..c26c04e4f7f 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 @@ -169,10 +169,6 @@ run_test(bool column_store, const char *uri, bool preserve) testutil_assert_errno(waitpid(pid, &status, 0) != -1); printf("Compact process interrupted and killed...\n"); - - /* Copy the data to a separate folder for debugging purpose. */ - testutil_copy_data(home); - printf("Open database and run recovery\n"); /* Open the connection which forces recovery to be run. */ diff --git a/src/third_party/wiredtiger/test/utility/misc.c b/src/third_party/wiredtiger/test/utility/misc.c index 8ebe7bfa934..9c71eecae0e 100644 --- a/src/third_party/wiredtiger/test/utility/misc.c +++ b/src/third_party/wiredtiger/test/utility/misc.c @@ -244,7 +244,8 @@ testutil_cleanup(TEST_OPTS *opts) /* * testutil_copy_data -- - * Copy the data to a backup folder. + * Copy the data to a backup folder. Usually, the data copy is cleaned up by a call to + * testutil_clean_test_artifacts. */ void testutil_copy_data(const char *dir) -- cgit v1.2.1