diff options
author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 16:21:23 +1100 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 05:52:01 +0000 |
commit | f355cf3bf8080043aba149900a090dfafdb9a4e0 (patch) | |
tree | 25035a219c94f284f0c1ebdd162cb32137a87ffe | |
parent | 91b7243ea143ee56a0c098b8d5226b68fe682a39 (diff) | |
download | mongo-f355cf3bf8080043aba149900a090dfafdb9a4e0.tar.gz |
Import wiredtiger: 364a2570ef441422f3ee1dcc30ea03cd45368d87 from branch mongodb-5.2
ref: 431191dc22..364a2570ef
for: 5.2.0-rc5
WT-8449 Fix inconsistency in flush_timestamp
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_tiered.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 33400f31ea9..78533785dc9 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": "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); |