From fba1184956511bc0be704b9f1a34834aaea30820 Mon Sep 17 00:00:00 2001 From: Will Korteland Date: Thu, 10 Feb 2022 04:20:05 +0000 Subject: Import wiredtiger: c07b8113d65b9d741a3e283ebbd78e86b53f86aa from branch mongodb-master ref: bf20820bb4..c07b8113d6 for: 5.3.0 WT-8700 Define a dedicated session for sweeping data in the cpp suite --- src/third_party/wiredtiger/import.data | 2 +- .../test/cppsuite/test_harness/workload/workload_tracking.cxx | 7 ++++--- .../test/cppsuite/test_harness/workload/workload_tracking.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 065f3e4f2da..6ffc1bb59fe 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": "bf20820bb47cd015f4353d445ad42681093ddc86" + "commit": "c07b8113d65b9d741a3e283ebbd78e86b53f86aa" } diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx index e451ff1aad2..68709d63f6f 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.cxx @@ -75,10 +75,11 @@ workload_tracking::load() logger::log_msg(LOG_TRACE, "Operations tracking created"); /* - * Open sweep cursor. This cursor will be used to clear out obsolete data from the tracking - * table. + * Open sweep cursor in a dedicated sweep session. This cursor will be used to clear out + * obsolete data from the tracking table. */ - _sweep_cursor = _session.open_scoped_cursor(_operation_table_name); + _sweep_session = connection_manager::instance().create_session(); + _sweep_cursor = _sweep_session.open_scoped_cursor(_operation_table_name); logger::log_msg(LOG_TRACE, "Tracking table sweep initialized"); } diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.h index b6c232376c7..3118becfa86 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/workload_tracking.h @@ -105,6 +105,7 @@ class workload_tracking : public component { private: scoped_session _session; + scoped_session _sweep_session; scoped_cursor _schema_track_cursor; scoped_cursor _sweep_cursor; const std::string _operation_table_config; -- cgit v1.2.1