Import wiredtiger: 217c4dd725c7bc005091ce95a1a722d90b1e88f5 from branch mongodb-master

ref: 12236ec8ec..217c4dd725
for: 6.3.0-rc0

WT-8539 Correct description for statistic for rolling back oldest pinned.

6 files changed, 63 insertions, 63 deletions

diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py
index d70fa773ae0..1d601b539b4 100644
--- a/src/third_party/wiredtiger/dist/stat_data.py
+++ b/src/third_party/wiredtiger/dist/stat_data.py
@@ -596,7 +596,6 @@ conn_stats = [
     TxnStat('txn_checkpoint_time_total', 'transaction checkpoint total time (msecs)', 'no_clear,no_scale'),
     TxnStat('txn_checkpoint_stop_stress_active', 'transaction checkpoint stop timing stress active', 'no_clear,no_scale'),
     TxnStat('txn_commit', 'transactions committed'),
-    TxnStat('txn_fail_cache', 'transaction failures due to history store'),
     TxnStat('txn_hs_ckpt_duration', 'transaction checkpoint history store file duration (usecs)'),
     TxnStat('txn_pinned_checkpoint_range', 'transaction range of IDs currently pinned by a checkpoint', 'no_clear,no_scale'),
     TxnStat('txn_pinned_range', 'transaction range of IDs currently pinned', 'no_clear,no_scale'),
@@ -614,6 +613,7 @@ conn_stats = [
     TxnStat('txn_prepared_updates_rolledback', 'Number of prepared updates rolled back'),
     TxnStat('txn_query_ts', 'query timestamp calls'),
     TxnStat('txn_rollback', 'transactions rolled back'),
+    TxnStat('txn_rollback_oldest_pinned', 'oldest pinned transaction ID rolled back for eviction'),
     TxnStat('txn_rollback_to_stable_running', 'transaction rollback to stable currently running', 'no_clear,no_scale'),
     TxnStat('txn_rts', 'rollback to stable calls'),
     TxnStat('txn_rts_pages_visited', 'rollback to stable pages visited'),
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index b175dfaa600..2f5b65415eb 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": "12236ec8ec896a9b40f0d4390743f4af31f06952"
+    "commit": "217c4dd725c7bc005091ce95a1a722d90b1e88f5"
 }
diff --git a/src/third_party/wiredtiger/src/evict/evict_lru.c b/src/third_party/wiredtiger/src/evict/evict_lru.c
index d7215e7850d..8ad74f25339 100644
--- a/src/third_party/wiredtiger/src/evict/evict_lru.c
+++ b/src/third_party/wiredtiger/src/evict/evict_lru.c
@@ -2402,7 +2402,7 @@ __wt_cache_eviction_worker(WT_SESSION_IMPL *session, bool busy, bool readonly, d
             ret = __wt_txn_is_blocking(session);
             if (ret == WT_ROLLBACK) {
                 --cache->evict_aggressive_score;
-                WT_STAT_CONN_INCR(session, txn_fail_cache);
+                WT_STAT_CONN_INCR(session, txn_rollback_oldest_pinned);
                 __wt_verbose_debug1(
                   session, WT_VERB_TRANSACTION, "%s", session->txn->rollback_reason);
             }
diff --git a/src/third_party/wiredtiger/src/include/stat.h b/src/third_party/wiredtiger/src/include/stat.h
index 6e7821feb70..25badd3c25e 100644
--- a/src/third_party/wiredtiger/src/include/stat.h
+++ b/src/third_party/wiredtiger/src/include/stat.h
@@ -835,6 +835,7 @@ struct __wt_connection_stats {
     int64_t txn_prepared_updates_key_repeated;
     int64_t txn_prepared_updates_rolledback;
     int64_t txn_read_overflow_remove;
+    int64_t txn_rollback_oldest_pinned;
     int64_t txn_prepare;
     int64_t txn_prepare_commit;
     int64_t txn_prepare_active;
@@ -889,7 +890,6 @@ struct __wt_connection_stats {
     int64_t txn_checkpoint;
     int64_t txn_checkpoint_obsolete_applied;
     int64_t txn_checkpoint_skipped;
-    int64_t txn_fail_cache;
     int64_t txn_checkpoint_fsync_post;
     int64_t txn_checkpoint_fsync_post_duration;
     int64_t txn_pinned_range;
diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in
index c3ea9aae8fd..cb099a97b4e 100644
--- a/src/third_party/wiredtiger/src/include/wiredtiger.in
+++ b/src/third_party/wiredtiger/src/include/wiredtiger.in
@@ -6496,137 +6496,137 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection);
 #define	WT_STAT_CONN_TXN_PREPARED_UPDATES_ROLLEDBACK	1494
 /*! transaction: number of times overflow removed value is read */
 #define	WT_STAT_CONN_TXN_READ_OVERFLOW_REMOVE		1495
+/*! transaction: oldest pinned transaction ID rolled back for eviction */
+#define	WT_STAT_CONN_TXN_ROLLBACK_OLDEST_PINNED		1496
 /*! transaction: prepared transactions */
-#define	WT_STAT_CONN_TXN_PREPARE			1496
+#define	WT_STAT_CONN_TXN_PREPARE			1497
 /*! transaction: prepared transactions committed */
-#define	WT_STAT_CONN_TXN_PREPARE_COMMIT			1497
+#define	WT_STAT_CONN_TXN_PREPARE_COMMIT			1498
 /*! transaction: prepared transactions currently active */
-#define	WT_STAT_CONN_TXN_PREPARE_ACTIVE			1498
+#define	WT_STAT_CONN_TXN_PREPARE_ACTIVE			1499
 /*! transaction: prepared transactions rolled back */
-#define	WT_STAT_CONN_TXN_PREPARE_ROLLBACK		1499
+#define	WT_STAT_CONN_TXN_PREPARE_ROLLBACK		1500
 /*! transaction: query timestamp calls */
-#define	WT_STAT_CONN_TXN_QUERY_TS			1500
+#define	WT_STAT_CONN_TXN_QUERY_TS			1501
 /*! transaction: race to read prepared update retry */
-#define	WT_STAT_CONN_TXN_READ_RACE_PREPARE_UPDATE	1501
+#define	WT_STAT_CONN_TXN_READ_RACE_PREPARE_UPDATE	1502
 /*! transaction: rollback to stable calls */
-#define	WT_STAT_CONN_TXN_RTS				1502
+#define	WT_STAT_CONN_TXN_RTS				1503
 /*!
  * transaction: rollback to stable history store records with stop
  * timestamps older than newer records
  */
-#define	WT_STAT_CONN_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START	1503
+#define	WT_STAT_CONN_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START	1504
 /*! transaction: rollback to stable inconsistent checkpoint */
-#define	WT_STAT_CONN_TXN_RTS_INCONSISTENT_CKPT		1504
+#define	WT_STAT_CONN_TXN_RTS_INCONSISTENT_CKPT		1505
 /*! transaction: rollback to stable keys removed */
-#define	WT_STAT_CONN_TXN_RTS_KEYS_REMOVED		1505
+#define	WT_STAT_CONN_TXN_RTS_KEYS_REMOVED		1506
 /*! transaction: rollback to stable keys restored */
-#define	WT_STAT_CONN_TXN_RTS_KEYS_RESTORED		1506
+#define	WT_STAT_CONN_TXN_RTS_KEYS_RESTORED		1507
 /*! transaction: rollback to stable pages visited */
-#define	WT_STAT_CONN_TXN_RTS_PAGES_VISITED		1507
+#define	WT_STAT_CONN_TXN_RTS_PAGES_VISITED		1508
 /*! transaction: rollback to stable restored tombstones from history store */
-#define	WT_STAT_CONN_TXN_RTS_HS_RESTORE_TOMBSTONES	1508
+#define	WT_STAT_CONN_TXN_RTS_HS_RESTORE_TOMBSTONES	1509
 /*! transaction: rollback to stable restored updates from history store */
-#define	WT_STAT_CONN_TXN_RTS_HS_RESTORE_UPDATES		1509
+#define	WT_STAT_CONN_TXN_RTS_HS_RESTORE_UPDATES		1510
 /*! transaction: rollback to stable skipping delete rle */
-#define	WT_STAT_CONN_TXN_RTS_DELETE_RLE_SKIPPED		1510
+#define	WT_STAT_CONN_TXN_RTS_DELETE_RLE_SKIPPED		1511
 /*! transaction: rollback to stable skipping stable rle */
-#define	WT_STAT_CONN_TXN_RTS_STABLE_RLE_SKIPPED		1511
+#define	WT_STAT_CONN_TXN_RTS_STABLE_RLE_SKIPPED		1512
 /*! transaction: rollback to stable sweeping history store keys */
-#define	WT_STAT_CONN_TXN_RTS_SWEEP_HS_KEYS		1512
+#define	WT_STAT_CONN_TXN_RTS_SWEEP_HS_KEYS		1513
 /*! transaction: rollback to stable tree walk skipping pages */
-#define	WT_STAT_CONN_TXN_RTS_TREE_WALK_SKIP_PAGES	1513
+#define	WT_STAT_CONN_TXN_RTS_TREE_WALK_SKIP_PAGES	1514
 /*! transaction: rollback to stable updates aborted */
-#define	WT_STAT_CONN_TXN_RTS_UPD_ABORTED		1514
+#define	WT_STAT_CONN_TXN_RTS_UPD_ABORTED		1515
 /*! transaction: rollback to stable updates removed from history store */
-#define	WT_STAT_CONN_TXN_RTS_HS_REMOVED			1515
+#define	WT_STAT_CONN_TXN_RTS_HS_REMOVED			1516
 /*! transaction: sessions scanned in each walk of concurrent sessions */
-#define	WT_STAT_CONN_TXN_SESSIONS_WALKED		1516
+#define	WT_STAT_CONN_TXN_SESSIONS_WALKED		1517
 /*! transaction: set timestamp calls */
-#define	WT_STAT_CONN_TXN_SET_TS				1517
+#define	WT_STAT_CONN_TXN_SET_TS				1518
 /*! transaction: set timestamp durable calls */
-#define	WT_STAT_CONN_TXN_SET_TS_DURABLE			1518
+#define	WT_STAT_CONN_TXN_SET_TS_DURABLE			1519
 /*! transaction: set timestamp durable updates */
-#define	WT_STAT_CONN_TXN_SET_TS_DURABLE_UPD		1519
+#define	WT_STAT_CONN_TXN_SET_TS_DURABLE_UPD		1520
 /*! transaction: set timestamp oldest calls */
-#define	WT_STAT_CONN_TXN_SET_TS_OLDEST			1520
+#define	WT_STAT_CONN_TXN_SET_TS_OLDEST			1521
 /*! transaction: set timestamp oldest updates */
-#define	WT_STAT_CONN_TXN_SET_TS_OLDEST_UPD		1521
+#define	WT_STAT_CONN_TXN_SET_TS_OLDEST_UPD		1522
 /*! transaction: set timestamp stable calls */
-#define	WT_STAT_CONN_TXN_SET_TS_STABLE			1522
+#define	WT_STAT_CONN_TXN_SET_TS_STABLE			1523
 /*! transaction: set timestamp stable updates */
-#define	WT_STAT_CONN_TXN_SET_TS_STABLE_UPD		1523
+#define	WT_STAT_CONN_TXN_SET_TS_STABLE_UPD		1524
 /*! transaction: transaction begins */
-#define	WT_STAT_CONN_TXN_BEGIN				1524
+#define	WT_STAT_CONN_TXN_BEGIN				1525
 /*! transaction: transaction checkpoint currently running */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING		1525
+#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING		1526
 /*!
  * transaction: transaction checkpoint currently running for history
  * store file
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING_HS		1526
+#define	WT_STAT_CONN_TXN_CHECKPOINT_RUNNING_HS		1527
 /*! transaction: transaction checkpoint generation */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_GENERATION		1527
+#define	WT_STAT_CONN_TXN_CHECKPOINT_GENERATION		1528
 /*!
  * transaction: transaction checkpoint history store file duration
  * (usecs)
  */
-#define	WT_STAT_CONN_TXN_HS_CKPT_DURATION		1528
+#define	WT_STAT_CONN_TXN_HS_CKPT_DURATION		1529
 /*! transaction: transaction checkpoint max time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX		1529
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX		1530
 /*! transaction: transaction checkpoint min time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN		1530
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN		1531
 /*!
  * transaction: transaction checkpoint most recent duration for gathering
  * all handles (usecs)
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION	1531
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION	1532
 /*!
  * transaction: transaction checkpoint most recent duration for gathering
  * applied handles (usecs)
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_APPLY	1532
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_APPLY	1533
 /*!
  * transaction: transaction checkpoint most recent duration for gathering
  * skipped handles (usecs)
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_SKIP	1533
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_SKIP	1534
 /*! transaction: transaction checkpoint most recent handles applied */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_APPLIED	1534
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_APPLIED	1535
 /*! transaction: transaction checkpoint most recent handles skipped */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_SKIPPED	1535
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_SKIPPED	1536
 /*! transaction: transaction checkpoint most recent handles walked */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_WALKED	1536
+#define	WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_WALKED	1537
 /*! transaction: transaction checkpoint most recent time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT		1537
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT		1538
 /*! transaction: transaction checkpoint prepare currently running */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_RUNNING	1538
+#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_RUNNING	1539
 /*! transaction: transaction checkpoint prepare max time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_MAX		1539
+#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_MAX		1540
 /*! transaction: transaction checkpoint prepare min time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_MIN		1540
+#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_MIN		1541
 /*! transaction: transaction checkpoint prepare most recent time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_RECENT		1541
+#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_RECENT		1542
 /*! transaction: transaction checkpoint prepare total time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_TOTAL		1542
+#define	WT_STAT_CONN_TXN_CHECKPOINT_PREP_TOTAL		1543
 /*! transaction: transaction checkpoint scrub dirty target */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET	1543
+#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET	1544
 /*! transaction: transaction checkpoint scrub time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME		1544
+#define	WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME		1545
 /*! transaction: transaction checkpoint stop timing stress active */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_STOP_STRESS_ACTIVE	1545
+#define	WT_STAT_CONN_TXN_CHECKPOINT_STOP_STRESS_ACTIVE	1546
 /*! transaction: transaction checkpoint total time (msecs) */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL		1546
+#define	WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL		1547
 /*! transaction: transaction checkpoints */
-#define	WT_STAT_CONN_TXN_CHECKPOINT			1547
+#define	WT_STAT_CONN_TXN_CHECKPOINT			1548
 /*! transaction: transaction checkpoints due to obsolete pages */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_OBSOLETE_APPLIED	1548
+#define	WT_STAT_CONN_TXN_CHECKPOINT_OBSOLETE_APPLIED	1549
 /*!
  * transaction: transaction checkpoints skipped because database was
  * clean
  */
-#define	WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED		1549
-/*! transaction: transaction failures due to history store */
-#define	WT_STAT_CONN_TXN_FAIL_CACHE			1550
+#define	WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED		1550
 /*!
  * transaction: transaction fsync calls for checkpoint after allocating
  * the transaction ID
diff --git a/src/third_party/wiredtiger/src/support/stat.c b/src/third_party/wiredtiger/src/support/stat.c
index 064e76b4549..521ef6faf0f 100644
--- a/src/third_party/wiredtiger/src/support/stat.c
+++ b/src/third_party/wiredtiger/src/support/stat.c
@@ -1715,6 +1715,7 @@ static const char *const __stats_connection_desc[] = {
   "transaction: Number of prepared updates repeated on the same key",
   "transaction: Number of prepared updates rolled back",
   "transaction: number of times overflow removed value is read",
+  "transaction: oldest pinned transaction ID rolled back for eviction",
   "transaction: prepared transactions",
   "transaction: prepared transactions committed",
   "transaction: prepared transactions currently active",
@@ -1770,7 +1771,6 @@ static const char *const __stats_connection_desc[] = {
   "transaction: transaction checkpoints",
   "transaction: transaction checkpoints due to obsolete pages",
   "transaction: transaction checkpoints skipped because database was clean",
-  "transaction: transaction failures due to history store",
   "transaction: transaction fsync calls for checkpoint after allocating the transaction ID",
   "transaction: transaction fsync duration for checkpoint after allocating the transaction ID "
   "(usecs)",
@@ -2322,6 +2322,7 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
     stats->txn_prepared_updates_key_repeated = 0;
     stats->txn_prepared_updates_rolledback = 0;
     stats->txn_read_overflow_remove = 0;
+    stats->txn_rollback_oldest_pinned = 0;
     stats->txn_prepare = 0;
     stats->txn_prepare_commit = 0;
     stats->txn_prepare_active = 0;
@@ -2376,7 +2377,6 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
     stats->txn_checkpoint = 0;
     stats->txn_checkpoint_obsolete_applied = 0;
     stats->txn_checkpoint_skipped = 0;
-    stats->txn_fail_cache = 0;
     stats->txn_checkpoint_fsync_post = 0;
     /* not clearing txn_checkpoint_fsync_post_duration */
     /* not clearing txn_pinned_range */
@@ -2947,6 +2947,7 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
     to->txn_prepared_updates_key_repeated += WT_STAT_READ(from, txn_prepared_updates_key_repeated);
     to->txn_prepared_updates_rolledback += WT_STAT_READ(from, txn_prepared_updates_rolledback);
     to->txn_read_overflow_remove += WT_STAT_READ(from, txn_read_overflow_remove);
+    to->txn_rollback_oldest_pinned += WT_STAT_READ(from, txn_rollback_oldest_pinned);
     to->txn_prepare += WT_STAT_READ(from, txn_prepare);
     to->txn_prepare_commit += WT_STAT_READ(from, txn_prepare_commit);
     to->txn_prepare_active += WT_STAT_READ(from, txn_prepare_active);
@@ -3004,7 +3005,6 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
     to->txn_checkpoint += WT_STAT_READ(from, txn_checkpoint);
     to->txn_checkpoint_obsolete_applied += WT_STAT_READ(from, txn_checkpoint_obsolete_applied);
     to->txn_checkpoint_skipped += WT_STAT_READ(from, txn_checkpoint_skipped);
-    to->txn_fail_cache += WT_STAT_READ(from, txn_fail_cache);
     to->txn_checkpoint_fsync_post += WT_STAT_READ(from, txn_checkpoint_fsync_post);
     to->txn_checkpoint_fsync_post_duration +=
       WT_STAT_READ(from, txn_checkpoint_fsync_post_duration);