From cbb9e88e93b46ab4df6ab9fcd34abfd19bc2c63f Mon Sep 17 00:00:00 2001 From: Luke Pearson Date: Wed, 3 May 2023 15:48:45 +1000 Subject: Import wiredtiger: 4061ee7289304fdd594e2b1377bfa432ee6533e1 from branch mongodb-master ref: abad2c9b00..4061ee7289 for: 7.1.0-rc0 WT-10911 Fix update eviction timeline metrics that are showing up incorrectly --- src/third_party/wiredtiger/src/conn/conn_cache.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/third_party/wiredtiger/src/conn') diff --git a/src/third_party/wiredtiger/src/conn/conn_cache.c b/src/third_party/wiredtiger/src/conn/conn_cache.c index 1f3d5cba1f5..83d7cf7774f 100644 --- a/src/third_party/wiredtiger/src/conn/conn_cache.c +++ b/src/third_party/wiredtiger/src/conn/conn_cache.c @@ -324,7 +324,9 @@ __wt_cache_stats_update(WT_SESSION_IMPL *session) WT_STAT_SET(session, stats, cache_bytes_updates, __wt_cache_bytes_updates(cache)); WT_STAT_SET(session, stats, cache_eviction_maximum_page_size, cache->evict_max_page_size); - WT_STAT_SET(session, stats, cache_eviction_maximum_seconds, cache->evict_max_seconds); + WT_STAT_SET(session, stats, cache_eviction_maximum_milliseconds, cache->evict_max_ms); + WT_STAT_SET( + session, stats, cache_reentry_hs_eviction_milliseconds, cache->reentry_hs_eviction_ms); WT_STAT_SET( session, stats, cache_pages_dirty, cache->pages_dirty_intl + cache->pages_dirty_leaf); @@ -343,10 +345,11 @@ __wt_cache_stats_update(WT_SESSION_IMPL *session) if (conn->evict_server_running) WT_STAT_SET(session, stats, cache_eviction_walks_active, cache->walk_session->nhazard); - WT_STAT_SET(session, stats, rec_maximum_hs_wrapup_seconds, conn->rec_maximum_hs_wrapup_seconds); WT_STAT_SET( - session, stats, rec_maximum_image_build_seconds, conn->rec_maximum_image_build_seconds); - WT_STAT_SET(session, stats, rec_maximum_seconds, conn->rec_maximum_seconds); + session, stats, rec_maximum_hs_wrapup_milliseconds, conn->rec_maximum_hs_wrapup_milliseconds); + WT_STAT_SET(session, stats, rec_maximum_image_build_milliseconds, + conn->rec_maximum_image_build_milliseconds); + WT_STAT_SET(session, stats, rec_maximum_milliseconds, conn->rec_maximum_milliseconds); } /* -- cgit v1.2.1