Import wiredtiger: f34a5afbb1d807ac90627555c3452fdec750b592 from branch mongodb-4.4

ref: 7374df6c34..f34a5afbb1
for: 4.4.7

WT-6737       Add explicit checkpoints in test_hs14 to improve predictability
WT-7228       Do not call next if we don't find the key in the history store
WT-7319       Implement a checkpoint_manager class that creates checkpoints at configurable intervals
WT-7320       Add the ability to check database size to the test framework
WT-7437       Upgrade documentation to doxygen 1.8.17
WT-7480       Cleanup thread_contexts in the test framework
WT-7514       Let tiered subsystem open files on behalf of block manager
WT-7523       Test to verify multiple prepared updates either commit/rollback
WT-7528       Fix WT_SESSION alter returns EBUSY
WT-7531       Treat update restore eviction as a progress
WT-7535       Complete CMake Windows support
WT-7577       Add sync configuration to flush_tier
WT-7579       Disable prefix testing in compatibility test due to snapshot isolation search mismatch
WT-7588       Make tiered object id numbers 32 bits
WT-7594       Use key_consistent mode on format TS runs
WT-7625       Updating throttle configuration to be more user friendly in testing framework
WT-7633       Switch doc-update Evergreen task to newer Ubuntu 20.04 distro
WT-7634       Disable man page generation in Doxygen
WT-7642       Fix insert search flag in history store cursor key order check
WT-7643       Update checkpoint decode tool for tiered storage
WT-7651       Add synchronization for flush_tier calls
WT-7656       Destroy tiered condvar after thread is joined

1 files changed, 3 insertions, 0 deletions

diff --git a/src/third_party/wiredtiger/src/include/connection.h b/src/third_party/wiredtiger/src/include/connection.h
index b13ab2b911e..a087086b200 100644
--- a/src/third_party/wiredtiger/src/include/connection.h
+++ b/src/third_party/wiredtiger/src/include/connection.h
@@ -225,6 +225,7 @@ struct __wt_connection_impl {
     WT_SPINLOCK api_lock;        /* Connection API spinlock */
     WT_SPINLOCK checkpoint_lock; /* Checkpoint spinlock */
     WT_SPINLOCK fh_lock;         /* File handle queue spinlock */
+    WT_SPINLOCK flush_tier_lock; /* Flush tier spinlock */
     WT_SPINLOCK metadata_lock;   /* Metadata update spinlock */
     WT_SPINLOCK reconfig_lock;   /* Single thread reconfigure */
     WT_SPINLOCK schema_lock;     /* Schema operation spinlock */
@@ -420,8 +421,10 @@ struct __wt_connection_impl {
     WT_SESSION_IMPL *tiered_session; /* Tiered thread session */
     wt_thread_t tiered_tid;          /* Tiered thread */
     bool tiered_tid_set;             /* Tiered thread set */
+    WT_CONDVAR *flush_cond;          /* Flush wait mutex */
     WT_CONDVAR *tiered_cond;         /* Tiered wait mutex */
     bool tiered_server_running;      /* Internal tiered server operating */
+    uint32_t flush_state;            /* State of last flush tier */
 
     WT_TIERED_MANAGER tiered_mgr;        /* Tiered manager thread information */
     WT_SESSION_IMPL *tiered_mgr_session; /* Tiered manager thread session */