Import wiredtiger: bedf5ac8fd983f479397302860ce356fd8b8bfa4 from branch mongodb-master

ref: 996723baf1..bedf5ac8fd
for: 7.0.0-rc0

WT-10326 Address copy without assignment

3 files changed, 4 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index e82aa5b51da..b111464a01d 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": "996723baf1ebc8faa2626093579dafac19dcbdb4"
+    "commit": "bedf5ac8fd983f479397302860ce356fd8b8bfa4"
 }
diff --git a/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.cpp b/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.cpp
index 8b0d6629791..d670c2774b0 100644
--- a/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.cpp
+++ b/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.cpp
@@ -39,14 +39,12 @@ void
 barrier::wait()
 {
     std::unique_lock<std::mutex> lock{_mutex};
-    auto lock_gen = _generation;
     if (!--_count) {
         _generation++;
         _count = _threshold;
         _cond.notify_all();
     } else {
-        if (!_cond.wait_for(lock, std::chrono::seconds(_sync_timeout),
-              [this, lock_gen] { return lock_gen != _generation; }))
+        if (_cond.wait_for(lock, _sync_timeout) == std::cv_status::timeout)
             logger::log_msg(LOG_WARN, "Barrier timed out!");
     }
 }
diff --git a/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.h b/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.h
index 7291ed6d129..c77ae0c65ec 100644
--- a/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.h
+++ b/src/third_party/wiredtiger/test/cppsuite/src/util/barrier.h
@@ -44,6 +44,7 @@ class barrier {
 public:
     /* Mutexes have a deleted copy constructor so we need to as well. */
     barrier(barrier const &) = delete;
+    barrier &operator=(barrier const &) = delete;
     ~barrier() = default;
     explicit barrier(std::size_t thread_count);
     void wait();
@@ -56,6 +57,6 @@ private:
     std::size_t _generation;
 
     /* Timeout for the synchronization wait. */
-    const int _sync_timeout = 600;
+    const std::chrono::seconds _sync_timeout{600};
 };
 } // namespace test_harness