Import wiredtiger: 364a2570ef441422f3ee1dcc30ea03cd45368d87 from branch mongodb-master

ref: 431191dc22..364a2570ef
for: 5.3.0

WT-8449       Fix inconsistency in flush_timestamp

2 files changed, 5 insertions, 3 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 39340915728..fe5fd03147a 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": "431191dc22180ebc6ccba0d057c984969ba0275c"
+    "commit": "364a2570ef441422f3ee1dcc30ea03cd45368d87"
 }
diff --git a/src/third_party/wiredtiger/src/conn/conn_tiered.c b/src/third_party/wiredtiger/src/conn/conn_tiered.c
index 92812012e22..bff95e0420b 100644
--- a/src/third_party/wiredtiger/src/conn/conn_tiered.c
+++ b/src/third_party/wiredtiger/src/conn/conn_tiered.c
@@ -262,9 +262,11 @@ __tier_flush_meta(
     release = true;
     /*
      * Once the flush call succeeds we want to first remove the file: entry from the metadata and
-     * then update the object: metadata to indicate the flush is complete.
+     * then update the object: metadata to indicate the flush is complete. Record the flush
+     * timestamp from the flush call. We know that no new flush_tier call can begin until all work
+     * from the last call completes, so the connection field is correct.
      */
-    __wt_timestamp_to_hex_string(conn->txn_global.last_ckpt_timestamp, hex_timestamp);
+    __wt_timestamp_to_hex_string(conn->flush_ts, hex_timestamp);
     WT_ERR(__wt_metadata_remove(session, local_uri));
     WT_ERR(__wt_metadata_search(session, obj_uri, &obj_value));
     __wt_seconds(session, &now);