diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-26 15:52:48 +1000 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2022-09-26 15:52:48 +1000 |
| commit | 59018abb95b6a344ea223589554a87185b4fae6e (patch) | |
| tree | 9087e8646c391241a3947b628713a69ff42a6f04 | |
| parent | 14b1ea6d58cf2a2169b2a07268fa2266419703b4 (diff) | |
| download | mongo-59018abb95b6a344ea223589554a87185b4fae6e.tar.gz | |
Import wiredtiger: 0af906ba5866a9dd3de643e1daf8d983028f88f4 from branch mongodb-6.1
ref: b12072d37a..0af906ba58
for: 6.1.0-rc3
WT-9863 - Downgrade assertion in __hs_delete_reinsert_from_pos (#8268)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/history/hs_rec.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 3e06c3247b2..919097d0505 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-6.1", - "commit": "b12072d37a533c8f57b65beb00020ba099e75505" + "commit": "0af906ba5866a9dd3de643e1daf8d983028f88f4" } diff --git a/src/third_party/wiredtiger/src/history/hs_rec.c b/src/third_party/wiredtiger/src/history/hs_rec.c index eb3697423be..52afb74eec1 100644 --- a/src/third_party/wiredtiger/src/history/hs_rec.c +++ b/src/third_party/wiredtiger/src/history/hs_rec.c @@ -907,8 +907,13 @@ __hs_delete_reinsert_from_pos(WT_SESSION_IMPL *session, WT_CURSOR *hs_cursor, ui return (0); WT_ERR(ret); - WT_ASSERT_ALWAYS( - session, ts == 1 || ts == WT_TS_NONE, "out-of-order timestamp update detected"); + /* + * If we find a key with a timestamp larger than or equal to the specified timestamp then the + * specified timestamp must be mixed mode. + * + * FIXME-WT-9846: Change this back to WT_ASSERT_ALWAYS once WT-9846 is resolved + */ + WT_ASSERT(session, ts == 1 || ts == WT_TS_NONE); /* * Fail the eviction if we detect any timestamp ordering issue and the error flag is set. We |