Import wiredtiger: df2f42d88daa17ded85ba668034fc6812a0a7170 from branch mongodb-master

ref: 2d31e5a375..df2f42d88d
for: 6.1.0-rc0

Reverted ticket(s):
WT-9439       Don't attempt to evict using a checkpoint-cursor snapshot

4 files changed, 1 insertions, 21 deletions

diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index d170736563d..562e66e0cd8 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": "2d31e5a375b966b5c9f9fa18103e6cb89e0c9635"
+    "commit": "df2f42d88daa17ded85ba668034fc6812a0a7170"
 }
diff --git a/src/third_party/wiredtiger/src/evict/evict_page.c b/src/third_party/wiredtiger/src/evict/evict_page.c
index 6aad887a18b..03125dd93ae 100644
--- a/src/third_party/wiredtiger/src/evict/evict_page.c
+++ b/src/third_party/wiredtiger/src/evict/evict_page.c
@@ -692,9 +692,6 @@ __evict_review(WT_SESSION_IMPL *session, WT_REF *ref, uint32_t evict_flags, bool
 
     WT_ASSERT(session, LF_ISSET(WT_REC_VISIBLE_ALL) || F_ISSET(session->txn, WT_TXN_HAS_SNAPSHOT));
 
-    /* We should not be trying to evict using a checkpoint-cursor transaction. */
-    WT_ASSERT(session, !F_ISSET(session->txn, WT_TXN_IS_CHECKPOINT));
-
     /*
      * Reconcile the page. Force read-committed isolation level if we are using snapshots for
      * eviction workers or application threads.
diff --git a/src/third_party/wiredtiger/src/include/cache_inline.h b/src/third_party/wiredtiger/src/include/cache_inline.h
index 79c803adb63..99a65cd95b8 100644
--- a/src/third_party/wiredtiger/src/include/cache_inline.h
+++ b/src/third_party/wiredtiger/src/include/cache_inline.h
@@ -452,15 +452,6 @@ __wt_cache_eviction_check(WT_SESSION_IMPL *session, bool busy, bool readonly, bo
         return (0);
 
     /*
-     * If the transaction is a checkpoint cursor transaction, don't try to evict. Because eviction
-     * keeps the current transaction snapshot, and the snapshot in a checkpoint cursor transaction
-     * can be (and likely is) very old, we won't be able to see anything current to evict and won't
-     * be able to accomplish anything useful.
-     */
-    if (F_ISSET(session->txn, WT_TXN_IS_CHECKPOINT))
-        return (0);
-
-    /*
      * If the current transaction is keeping the oldest ID pinned, it is in the middle of an
      * operation. This may prevent the oldest ID from moving forward, leading to deadlock, so only
      * evict what we can. Otherwise, we are at a transaction boundary and we can work harder to make
diff --git a/src/third_party/wiredtiger/src/include/txn_inline.h b/src/third_party/wiredtiger/src/include/txn_inline.h
index 1736fb7bdaf..9393875b7d6 100644
--- a/src/third_party/wiredtiger/src/include/txn_inline.h
+++ b/src/third_party/wiredtiger/src/include/txn_inline.h
@@ -519,10 +519,6 @@ __txn_visible_all_id(WT_SESSION_IMPL *session, uint64_t id)
 
     txn = session->txn;
 
-    /* Make sure that checkpoint cursor transactions only read checkpoints. */
-    WT_ASSERT(
-      session, WT_READING_CHECKPOINT(session) == F_ISSET(session->txn, WT_TXN_IS_CHECKPOINT));
-
     /*
      * When reading from a checkpoint, all readers use the same snapshot, so a transaction is
      * globally visible if it is visible in that snapshot. Note that this can cause things that were
@@ -572,10 +568,6 @@ __wt_txn_visible_all(WT_SESSION_IMPL *session, uint64_t id, wt_timestamp_t times
     if (timestamp == WT_TS_NONE)
         return (true);
 
-    /* Make sure that checkpoint cursor transactions only read checkpoints. */
-    WT_ASSERT(
-      session, WT_READING_CHECKPOINT(session) == F_ISSET(session->txn, WT_TXN_IS_CHECKPOINT));
-
     /* When reading a checkpoint, use the checkpoint state instead of the current state. */
     if (WT_READING_CHECKPOINT(session))
         return (session->txn->checkpoint_oldest_timestamp != WT_TS_NONE &&