diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-10-26 18:37:29 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-26 08:06:38 +0000 |
| commit | 41adc13097a3529f35e0be47bd70477dfa434507 (patch) | |
| tree | f109d16b9085df3f26e797a572ae7fcf7265b1a3 /src/third_party/wiredtiger | |
| parent | ab847aa8d4a5baf5a1442a77eb9b850e1499c7f9 (diff) | |
| download | mongo-41adc13097a3529f35e0be47bd70477dfa434507.tar.gz | |
Import wiredtiger: 2145553c32d67a32dd9646c7d5777a5373204b8a from branch mongodb-master
ref: c522dcecae..2145553c32
for: 6.2.0-rc0
WT-9877 Fix assertion failure when evicting metadata page during checkpoint-cursor operation (#8380)
Diffstat (limited to 'src/third_party/wiredtiger')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_read.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 31e6e0b1496..f76a3c141c8 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": "c522dcecaee4091682cdbba66353df47a9f14e27" + "commit": "2145553c32d67a32dd9646c7d5777a5373204b8a" } diff --git a/src/third_party/wiredtiger/src/btree/bt_read.c b/src/third_party/wiredtiger/src/btree/bt_read.c index 6baf6f780df..77196a7175b 100644 --- a/src/third_party/wiredtiger/src/btree/bt_read.c +++ b/src/third_party/wiredtiger/src/btree/bt_read.c @@ -381,6 +381,13 @@ read: goto skip_evict; /* + * Don't evict if we are operating in a transaction on a checkpoint cursor. Eviction + * would use the cursor's snapshot, which won't be correct. + */ + if (F_ISSET(session->txn, WT_TXN_IS_CHECKPOINT)) + goto skip_evict; + + /* * Forcibly evict pages that are too big. */ if (force_attempts < 10 && __evict_force_check(session, ref)) { |