Import wiredtiger: 18dfb9e58e39927696affcd8e362364e23e1aa59 from branch mongodb-4.4r4.4.0-rc4

ref: a707df12a2..18dfb9e58e
for: 4.4.0-rc4

WT-5242       Minimize checkpoints pinned during backup
WT-5470       Reduce copies and allocations in read path
WT-5673       Prepare support with durable history: modify verify and salvage as needed
WT-5677       Prepare support with durable history: add test/format stress tests
WT-5710       Review WT_PANIC usage
WT-5716       Create the history store file at the same time as creating the metadata file in wiredtiger open
WT-5839       Ignore non-globally visible tombstones for both data store and hs store in hs verification
WT-5841       Return WT_TRY_SALVAGE when the history file is removed or truncated
WT-5928       Cleanup stale FIXMEs from durable history
WT-5977       WT_SESSION_NO_RECONCILE flag set by history cursor prevents eviction
WT-5984       Allow prepared updates to be evicted in durable history
WT-6009       Prepare support with durable history: add statistic for prepared updates evicted
WT-6032       Turn on mongodb-4.4 branch upgrade/downgrade testing
WT-6051       Fix reconstructing full value from modifies for string format
WT-6068       Re-enable tests temporarily disabled during durable history development
WT-6069       Remove WT_UPDATE_RESTORED_FROM_DISK flag
WT-6070       Coverity : Copy paste error
WT-6071       Coverity : Change format specifier
WT-6086       Move time windows and aggregated time windows into structures
WT-6087       Add a C2S(cursor) macro to simplify translation from a cursor to a session
WT-6095       Verify on-disk page only for row store as part of rollback to stable
WT-6109       Cleanup usage of cursor->session
WT-6110       Cleanup cast from cbt to cursor
WT-6120       Remove use-after-free in __verify_history_store_id
WT-6130       Disable test_random_abort

1 files changed, 1 insertions, 9 deletions

diff --git a/src/third_party/wiredtiger/src/session/session_api.c b/src/third_party/wiredtiger/src/session/session_api.c
index c843d592160..459a0757032 100644
--- a/src/third_party/wiredtiger/src/session/session_api.c
+++ b/src/third_party/wiredtiger/src/session/session_api.c
@@ -1570,20 +1570,12 @@ __session_verify(WT_SESSION *wt_session, const char *uri, const char *config)
     SESSION_API_CALL(session, verify, config, cfg);
     WT_ERR(__wt_inmem_unsupported_op(session, NULL));
 
-    /*
-     * Even if we're not verifying the history store, we need to be able to iterate over the history
-     * store content for another table. In order to do this, we must ignore tombstones in the
-     * history store since every history store record is succeeded with a tombstone.
-     */
-    F_SET(session, WT_SESSION_IGNORE_HS_TOMBSTONE);
-
     /* Block out checkpoints to avoid spurious EBUSY errors. */
     WT_WITH_CHECKPOINT_LOCK(
       session, WT_WITH_SCHEMA_LOCK(session, ret = __wt_schema_worker(session, uri, __wt_verify,
                                               NULL, cfg, WT_DHANDLE_EXCLUSIVE | WT_BTREE_VERIFY)));
     WT_ERR(ret);
 err:
-    F_CLR(session, WT_SESSION_IGNORE_HS_TOMBSTONE);
     if (ret != 0)
         WT_STAT_CONN_INCR(session, session_table_verify_fail);
     else
@@ -1658,7 +1650,7 @@ err:
         F_CLR(session, WT_SESSION_RESOLVING_TXN);
     } else if (F_ISSET(txn, WT_TXN_RUNNING)) {
         if (F_ISSET(txn, WT_TXN_PREPARE))
-            WT_PANIC_RET(session, ret, "failed to commit prepared transaction, failing the system");
+            WT_RET_PANIC(session, ret, "failed to commit prepared transaction, failing the system");
 
         WT_TRET(__wt_session_reset_cursors(session, false));
         F_SET(session, WT_SESSION_RESOLVING_TXN);