From 65c786044c51cb67fd4445c2a1a4556fbf7fd39c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sat, 2 Apr 2022 14:21:51 -0700 Subject: [PATCH v70 15/27] pgstat: add pg_stat_force_next_flush(). FIXME: Needs to bump catversion. Author: Andres Freund Discussion: https://postgr.es/m/20220303021600.hs34ghqcw6zcokdh@alap3.anarazel.de --- src/include/catalog/pg_proc.dat | 5 +++++ src/include/pgstat.h | 1 + src/backend/utils/activity/pgstat.c | 23 +++++++++++++++++++++++ src/backend/utils/adt/pgstatfuncs.c | 10 ++++++++++ 4 files changed, 39 insertions(+) diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 25304430f44..12526c599e0 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -5744,6 +5744,11 @@ proname => 'pg_stat_clear_snapshot', proisstrict => 'f', provolatile => 'v', proparallel => 'r', prorettype => 'void', proargtypes => '', prosrc => 'pg_stat_clear_snapshot' }, +{ oid => '2137', + descr => 'statistics: force stats to be flushed after the next commit', + proname => 'pg_stat_force_next_flush', proisstrict => 'f', provolatile => 'v', + proparallel => 'r', prorettype => 'void', proargtypes => '', + prosrc => 'pg_stat_force_next_flush' }, { oid => '2274', descr => 'statistics: reset collected statistics for current database', proname => 'pg_stat_reset', proisstrict => 'f', provolatile => 'v', diff --git a/src/include/pgstat.h b/src/include/pgstat.h index 2f0fb717063..4ed8ef887ec 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -427,6 +427,7 @@ extern void pgstat_execute_transactional_drops(int ndrops, struct xl_xact_stats_ /* Functions called from backends */ extern long pgstat_report_stat(bool force); +extern void pgstat_force_next_flush(void); extern void pgstat_reset_counters(void); extern void pgstat_reset_single_counter(PgStat_Kind kind, Oid objectid); diff --git a/src/backend/utils/activity/pgstat.c b/src/backend/utils/activity/pgstat.c index fb1b2dd743d..855f8cfa22b 100644 --- a/src/backend/utils/activity/pgstat.c +++ b/src/backend/utils/activity/pgstat.c @@ -221,6 +221,12 @@ static MemoryContext pgStatPendingContext = NULL; static dlist_head pgStatPending = DLIST_STATIC_INIT(pgStatPending); +/* + * Force the next stats flush to happen regardless of + * PGSTAT_MIN_INTERVAL. Useful in test scripts. + */ +static bool pgStatForceNextFlush = false; + /* * For assertions that check pgstat is not used before initialization / after * shutdown. @@ -562,6 +568,13 @@ pgstat_report_stat(bool force) pgstat_assert_is_up(); Assert(!IsTransactionBlock()); + /* "absorb" the forced flush even if there's nothing to flush */ + if (pgStatForceNextFlush) + { + force = true; + pgStatForceNextFlush = false; + } + /* Don't expend a clock check if nothing to do */ if (dlist_is_empty(&pgStatPending) && !have_slrustats && @@ -639,6 +652,16 @@ pgstat_report_stat(bool force) return 0; } +/* + * Force locally pending stats to be flushed during the next + * pgstat_report_stat() call. This is useful for writing tests. + */ +void +pgstat_force_next_flush(void) +{ + pgStatForceNextFlush = true; +} + /* * Only for use by pgstat_reset_counters() */ diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 848f410c96b..caaf0c5a672 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -2068,6 +2068,16 @@ pg_stat_clear_snapshot(PG_FUNCTION_ARGS) } +/* Force statistics to be reported at the next occasion */ +Datum +pg_stat_force_next_flush(PG_FUNCTION_ARGS) +{ + pgstat_force_next_flush(); + + PG_RETURN_VOID(); +} + + /* Reset all counters for the current database */ Datum pg_stat_reset(PG_FUNCTION_ARGS) -- 2.35.1.677.gabf474a5dd