commit 9a155dd54634aa83dbab0852849e0a69288b0b9f Author: Anton A. Melnikov Date: Thu Sep 15 01:53:17 2022 +0300 Add statistic about restartpoint into pg_stat_bgwriter diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql index 55f7ec79e0..5ef2ce0c89 100644 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@ -1104,6 +1104,9 @@ CREATE VIEW pg_stat_bgwriter AS SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed, pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req, + pg_stat_get_bgwriter_timed_restartpoints() AS restartpoints_timed, + pg_stat_get_bgwriter_requested_restartpoints() AS restartpoints_req, + pg_stat_get_bgwriter_performed_restartpoints() AS restartpoints_done, pg_stat_get_checkpoint_write_time() AS checkpoint_write_time, pg_stat_get_checkpoint_sync_time() AS checkpoint_sync_time, pg_stat_get_bgwriter_buf_written_checkpoints() AS buffers_checkpoint, diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c index 5fc076fc14..2296701ddf 100644 --- a/src/backend/postmaster/checkpointer.c +++ b/src/backend/postmaster/checkpointer.c @@ -350,6 +350,8 @@ CheckpointerMain(void) pg_time_t now; int elapsed_secs; int cur_timeout; + bool chkpt_or_rstpt_requested = false; + bool chkpt_or_rstpt_timed = false; /* Clear any already-pending wakeups */ ResetLatch(MyLatch); @@ -368,7 +370,7 @@ CheckpointerMain(void) if (((volatile CheckpointerShmemStruct *) CheckpointerShmem)->ckpt_flags) { do_checkpoint = true; - PendingCheckpointerStats.requested_checkpoints++; + chkpt_or_rstpt_requested = true; } /* @@ -382,7 +384,7 @@ CheckpointerMain(void) if (elapsed_secs >= CheckPointTimeout) { if (!do_checkpoint) - PendingCheckpointerStats.timed_checkpoints++; + chkpt_or_rstpt_timed = true; do_checkpoint = true; flags |= CHECKPOINT_CAUSE_TIME; } @@ -418,6 +420,24 @@ CheckpointerMain(void) if (flags & CHECKPOINT_END_OF_RECOVERY) do_restartpoint = false; + if (chkpt_or_rstpt_requested) + { + chkpt_or_rstpt_requested = false; + if (do_restartpoint) + PendingCheckpointerStats.requested_restartpoints++; + else + PendingCheckpointerStats.requested_checkpoints++; + } + + if (chkpt_or_rstpt_timed) + { + chkpt_or_rstpt_timed = false; + if (do_restartpoint) + PendingCheckpointerStats.timed_restartpoints++; + else + PendingCheckpointerStats.timed_checkpoints++; + } + /* * We will warn if (a) too soon since last checkpoint (whatever * caused it) and (b) somebody set the CHECKPOINT_CAUSE_XLOG flag @@ -481,6 +501,9 @@ CheckpointerMain(void) * checkpoints happen at a predictable spacing. */ last_checkpoint_time = now; + + if (do_restartpoint) + PendingCheckpointerStats.performed_restartpoints++; } else { diff --git a/src/backend/utils/activity/pgstat_checkpointer.c b/src/backend/utils/activity/pgstat_checkpointer.c index af8d513e7b..9de99a2cf1 100644 --- a/src/backend/utils/activity/pgstat_checkpointer.c +++ b/src/backend/utils/activity/pgstat_checkpointer.c @@ -49,6 +49,9 @@ pgstat_report_checkpointer(void) #define CHECKPOINTER_ACC(fld) stats_shmem->stats.fld += PendingCheckpointerStats.fld CHECKPOINTER_ACC(timed_checkpoints); CHECKPOINTER_ACC(requested_checkpoints); + CHECKPOINTER_ACC(timed_restartpoints); + CHECKPOINTER_ACC(requested_restartpoints); + CHECKPOINTER_ACC(performed_restartpoints); CHECKPOINTER_ACC(checkpoint_write_time); CHECKPOINTER_ACC(checkpoint_sync_time); CHECKPOINTER_ACC(buf_written_checkpoints); @@ -112,6 +115,9 @@ pgstat_checkpointer_snapshot_cb(void) #define CHECKPOINTER_COMP(fld) pgStatLocal.snapshot.checkpointer.fld -= reset.fld; CHECKPOINTER_COMP(timed_checkpoints); CHECKPOINTER_COMP(requested_checkpoints); + CHECKPOINTER_COMP(timed_restartpoints); + CHECKPOINTER_COMP(requested_restartpoints); + CHECKPOINTER_COMP(performed_restartpoints); CHECKPOINTER_COMP(checkpoint_write_time); CHECKPOINTER_COMP(checkpoint_sync_time); CHECKPOINTER_COMP(buf_written_checkpoints); diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index be15b4b2e5..f76448eba6 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -1668,6 +1668,24 @@ pg_stat_get_bgwriter_requested_checkpoints(PG_FUNCTION_ARGS) PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->requested_checkpoints); } +Datum +pg_stat_get_bgwriter_timed_restartpoints(PG_FUNCTION_ARGS) +{ + PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->timed_restartpoints); +} + +Datum +pg_stat_get_bgwriter_requested_restartpoints(PG_FUNCTION_ARGS) +{ + PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->requested_restartpoints); +} + +Datum +pg_stat_get_bgwriter_performed_restartpoints(PG_FUNCTION_ARGS) +{ + PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->performed_restartpoints); +} + Datum pg_stat_get_bgwriter_buf_written_checkpoints(PG_FUNCTION_ARGS) { diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index a07e737a33..a1d1fe6796 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -5604,6 +5604,21 @@ proname => 'pg_stat_get_bgwriter_requested_checkpoints', provolatile => 's', proparallel => 'r', prorettype => 'int8', proargtypes => '', prosrc => 'pg_stat_get_bgwriter_requested_checkpoints' }, +{ oid => '9938', + descr => 'statistics: number of timed restartpoints started by the bgwriter', + proname => 'pg_stat_get_bgwriter_timed_restartpoints', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => '', + prosrc => 'pg_stat_get_bgwriter_timed_restartpoints' }, +{ oid => '9939', + descr => 'statistics: number of backend requested restartpoints started by the bgwriter', + proname => 'pg_stat_get_bgwriter_requested_restartpoints', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => '', + prosrc => 'pg_stat_get_bgwriter_requested_restartpoints' }, +{ oid => '9940', + descr => 'statistics: number of backend performed restartpoints started by the bgwriter', + proname => 'pg_stat_get_bgwriter_performed_restartpoints', provolatile => 's', + proparallel => 'r', prorettype => 'int8', proargtypes => '', + prosrc => 'pg_stat_get_bgwriter_performed_restartpoints' }, { oid => '2771', descr => 'statistics: number of buffers written by the bgwriter during checkpoints', proname => 'pg_stat_get_bgwriter_buf_written_checkpoints', provolatile => 's', diff --git a/src/include/pgstat.h b/src/include/pgstat.h index ac28f813b4..680ff6f39b 100644 --- a/src/include/pgstat.h +++ b/src/include/pgstat.h @@ -269,6 +269,9 @@ typedef struct PgStat_CheckpointerStats { PgStat_Counter timed_checkpoints; PgStat_Counter requested_checkpoints; + PgStat_Counter timed_restartpoints; + PgStat_Counter requested_restartpoints; + PgStat_Counter performed_restartpoints; PgStat_Counter checkpoint_write_time; /* times in milliseconds */ PgStat_Counter checkpoint_sync_time; PgStat_Counter buf_written_checkpoints;