diff options
| author | Alison Felizzi <alison.felizzi@mongodb.com> | 2021-11-04 05:00:44 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-04 05:26:46 +0000 |
| commit | bbc304eb5a01909c1536e083105c7b6b97dec55a (patch) | |
| tree | 211623ee5a79d58a46fff03a1d045241d10cb1ed /src/third_party/wiredtiger/src/txn/txn_timestamp.c | |
| parent | bf94b216ccaf4b485f392c535e3b753578d679d6 (diff) | |
| download | mongo-bbc304eb5a01909c1536e083105c7b6b97dec55a.tar.gz | |
Import wiredtiger: 4a4a0259eca4e9b7cdebc4512145b7ca17c2e742 from branch mongodb-master
ref: d6bd5d1ffd..4a4a0259ec
for: 5.2.0
WT-8114 Revert allow setting the prepare timestamp smaller than or equal to the latest active read timestamp with roundup prepare config
Diffstat (limited to 'src/third_party/wiredtiger/src/txn/txn_timestamp.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/txn/txn_timestamp.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/third_party/wiredtiger/src/txn/txn_timestamp.c b/src/third_party/wiredtiger/src/txn/txn_timestamp.c index c138f23fe57..784c2cacfed 100644 --- a/src/third_party/wiredtiger/src/txn/txn_timestamp.c +++ b/src/third_party/wiredtiger/src/txn/txn_timestamp.c @@ -715,19 +715,7 @@ __wt_txn_set_prepare_timestamp(WT_SESSION_IMPL *session, wt_timestamp_t prepare_ WT_RET_MSG(session, EINVAL, "commit timestamp should not have been set before the prepare timestamp"); - /* - * Allows setting the prepared timestamp smaller than or equal to the latest active read - * timestamp. This feature is necessary to find the largest key in the table even if that - * key has been deleted. Set this flag cautiously as it breaks repeated reads. - */ -#ifdef HAVE_DIAGNOSTIC - if (!F_ISSET(txn, WT_TXN_TS_ROUND_PREPARED)) - WT_RET(__txn_assert_after_reads(session, "prepare", prepare_ts)); - else - WT_RET(__wt_msg(session, - "Skip checking prepare timestamp %s against the latest active read timestamp.", - __wt_timestamp_to_string(prepare_ts, ts_string[0]))); -#endif + WT_RET(__txn_assert_after_reads(session, "prepare", prepare_ts)); /* * Check whether the prepare timestamp is less than the oldest timestamp. |