summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/support/stat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/third_party/wiredtiger/src/support/stat.c')
-rw-r--r--src/third_party/wiredtiger/src/support/stat.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/third_party/wiredtiger/src/support/stat.c b/src/third_party/wiredtiger/src/support/stat.c
index 4a4bf31d83c..b1f9116af24 100644
--- a/src/third_party/wiredtiger/src/support/stat.c
+++ b/src/third_party/wiredtiger/src/support/stat.c
@@ -62,8 +62,6 @@ static const char *const __stats_dsrc_desc[] = {
"disk update after validating the update chain",
"cache: eviction gave up due to detecting out of order timestamps on the update chain after the "
"selected on disk update",
- "cache: eviction gave up due to needing to remove a record from the history store but checkpoint "
- "is running",
"cache: eviction walk passes of a file",
"cache: eviction walk target pages histogram - 0-9",
"cache: eviction walk target pages histogram - 10-31",
@@ -339,7 +337,6 @@ __wt_stat_dsrc_clear_single(WT_DSRC_STATS *stats)
stats->cache_eviction_blocked_ooo_checkpoint_race_2 = 0;
stats->cache_eviction_blocked_ooo_checkpoint_race_3 = 0;
stats->cache_eviction_blocked_ooo_checkpoint_race_4 = 0;
- stats->cache_eviction_blocked_remove_hs_race_with_checkpoint = 0;
stats->cache_eviction_walk_passes = 0;
stats->cache_eviction_target_page_lt10 = 0;
stats->cache_eviction_target_page_lt32 = 0;
@@ -598,8 +595,6 @@ __wt_stat_dsrc_aggregate_single(WT_DSRC_STATS *from, WT_DSRC_STATS *to)
from->cache_eviction_blocked_ooo_checkpoint_race_3;
to->cache_eviction_blocked_ooo_checkpoint_race_4 +=
from->cache_eviction_blocked_ooo_checkpoint_race_4;
- to->cache_eviction_blocked_remove_hs_race_with_checkpoint +=
- from->cache_eviction_blocked_remove_hs_race_with_checkpoint;
to->cache_eviction_walk_passes += from->cache_eviction_walk_passes;
to->cache_eviction_target_page_lt10 += from->cache_eviction_target_page_lt10;
to->cache_eviction_target_page_lt32 += from->cache_eviction_target_page_lt32;
@@ -853,8 +848,6 @@ __wt_stat_dsrc_aggregate(WT_DSRC_STATS **from, WT_DSRC_STATS *to)
WT_STAT_READ(from, cache_eviction_blocked_ooo_checkpoint_race_3);
to->cache_eviction_blocked_ooo_checkpoint_race_4 +=
WT_STAT_READ(from, cache_eviction_blocked_ooo_checkpoint_race_4);
- to->cache_eviction_blocked_remove_hs_race_with_checkpoint +=
- WT_STAT_READ(from, cache_eviction_blocked_remove_hs_race_with_checkpoint);
to->cache_eviction_walk_passes += WT_STAT_READ(from, cache_eviction_walk_passes);
to->cache_eviction_target_page_lt10 += WT_STAT_READ(from, cache_eviction_target_page_lt10);
to->cache_eviction_target_page_lt32 += WT_STAT_READ(from, cache_eviction_target_page_lt32);
@@ -1121,8 +1114,6 @@ static const char *const __stats_connection_desc[] = {
"disk update after validating the update chain",
"cache: eviction gave up due to detecting out of order timestamps on the update chain after the "
"selected on disk update",
- "cache: eviction gave up due to needing to remove a record from the history store but checkpoint "
- "is running",
"cache: eviction passes of a file",
"cache: eviction server candidate queue empty when topping up",
"cache: eviction server candidate queue not empty when topping up",
@@ -1512,6 +1503,9 @@ static const char *const __stats_connection_desc[] = {
"transaction: prepared transactions committed",
"transaction: prepared transactions currently active",
"transaction: prepared transactions rolled back",
+ "transaction: prepared transactions rolled back and do not remove the history store entry",
+ "transaction: prepared transactions rolled back and fix the history store entry with checkpoint "
+ "reserved transaction id",
"transaction: query timestamp calls",
"transaction: race to read prepared update retry",
"transaction: rollback to stable calls",
@@ -1688,7 +1682,6 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->cache_eviction_blocked_ooo_checkpoint_race_2 = 0;
stats->cache_eviction_blocked_ooo_checkpoint_race_3 = 0;
stats->cache_eviction_blocked_ooo_checkpoint_race_4 = 0;
- stats->cache_eviction_blocked_remove_hs_race_with_checkpoint = 0;
stats->cache_eviction_walk_passes = 0;
stats->cache_eviction_queue_empty = 0;
stats->cache_eviction_queue_not_empty = 0;
@@ -2069,6 +2062,8 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats)
stats->txn_prepare_commit = 0;
stats->txn_prepare_active = 0;
stats->txn_prepare_rollback = 0;
+ stats->txn_prepare_rollback_do_not_remove_hs_update = 0;
+ stats->txn_prepare_rollback_fix_hs_update_with_ckpt_reserved_txnid = 0;
stats->txn_query_ts = 0;
stats->txn_read_race_prepare_update = 0;
stats->txn_rts = 0;
@@ -2224,8 +2219,6 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
WT_STAT_READ(from, cache_eviction_blocked_ooo_checkpoint_race_3);
to->cache_eviction_blocked_ooo_checkpoint_race_4 +=
WT_STAT_READ(from, cache_eviction_blocked_ooo_checkpoint_race_4);
- to->cache_eviction_blocked_remove_hs_race_with_checkpoint +=
- WT_STAT_READ(from, cache_eviction_blocked_remove_hs_race_with_checkpoint);
to->cache_eviction_walk_passes += WT_STAT_READ(from, cache_eviction_walk_passes);
to->cache_eviction_queue_empty += WT_STAT_READ(from, cache_eviction_queue_empty);
to->cache_eviction_queue_not_empty += WT_STAT_READ(from, cache_eviction_queue_not_empty);
@@ -2641,6 +2634,10 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS *
to->txn_prepare_commit += WT_STAT_READ(from, txn_prepare_commit);
to->txn_prepare_active += WT_STAT_READ(from, txn_prepare_active);
to->txn_prepare_rollback += WT_STAT_READ(from, txn_prepare_rollback);
+ to->txn_prepare_rollback_do_not_remove_hs_update +=
+ WT_STAT_READ(from, txn_prepare_rollback_do_not_remove_hs_update);
+ to->txn_prepare_rollback_fix_hs_update_with_ckpt_reserved_txnid +=
+ WT_STAT_READ(from, txn_prepare_rollback_fix_hs_update_with_ckpt_reserved_txnid);
to->txn_query_ts += WT_STAT_READ(from, txn_query_ts);
to->txn_read_race_prepare_update += WT_STAT_READ(from, txn_read_race_prepare_update);
to->txn_rts += WT_STAT_READ(from, txn_rts);