diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-01-11 03:06:40 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 04:01:38 +0000 |
| commit | 5bec6941e47c06f4b7b3b32c96a7dcb3f621a9c8 (patch) | |
| tree | a86ac17e7f998b637392c8afe8486d360283aca9 /src/third_party/wiredtiger/src/conn/conn_tiered.c | |
| parent | a648d258b8be17c18680d375306e325dcc0ca24e (diff) | |
| download | mongo-5bec6941e47c06f4b7b3b32c96a7dcb3f621a9c8.tar.gz | |
Import wiredtiger: 364a2570ef441422f3ee1dcc30ea03cd45368d87 from branch mongodb-master
ref: 431191dc22..364a2570ef
for: 5.3.0
WT-8449 Fix inconsistency in flush_timestamp
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_tiered.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_tiered.c | 6 |
1 files changed, 4 insertions, 2 deletions
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); |