database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Introduce pg_stat_checkpointer

Browse Source 
Historically, the statistics of the checkpointer have been always part
of pg_stat_bgwriter.  This commit removes a few columns from
pg_stat_bgwriter, and introduces pg_stat_checkpointer with equivalent,
renamed columns (plus a new one for the reset timestamp):
- checkpoints_timed -> num_timed
- checkpoints_req -> num_requested
- checkpoint_write_time -> write_time
- checkpoint_sync_time -> sync_time
- buffers_checkpoint -> buffers_written

The fields of PgStat_CheckpointerStats and its SQL functions are renamed
to match with the new field names, for consistency.  Note that
background writer and checkpointer have been split into two different
processes in commits 806a2aee3791 and bf405ba8e460.  The pgstat
structures were already split, making this change straight-forward.

Bump catalog version.

Author: Bharath Rupireddy
Reviewed-by: Bertrand Drouvot, Andres Freund, Michael Paquier
Discussion: https://postgr.es/m/CALj2ACVxX2ii=66RypXRweZe2EsBRiPMj0aHfRfHUeXJcC7kHg@mail.gmail.com
This commit is contained in:
Michael Paquier 2023-10-30 09:47:16 +09:00
parent bf01e1ba96
commit 96f052613f
14 changed files with 215 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
doc/src/sgml/monitoring.sgml
View File

@ -451,6 +451,15 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
</entry> </entry>
</row> </row>
<row>
<entry><structname>pg_stat_checkpointer</structname><indexterm><primary>pg_stat_checkpointer</primary></indexterm></entry>
<entry>One row only, showing statistics about the
checkpointer process's activity. See
<link linkend="monitoring-pg-stat-checkpointer-view">
<structname>pg_stat_checkpointer</structname></link> for details.
</entry>
</row>
<row> <row>
<entry><structname>pg_stat_database</structname><indexterm><primary>pg_stat_database</primary></indexterm></entry> <entry><structname>pg_stat_database</structname><indexterm><primary>pg_stat_database</primary></indexterm></entry>
<entry>One row per database, showing database-wide statistics. See <entry>One row per database, showing database-wide statistics. See
@ -2868,7 +2877,7 @@ description | Waiting for a newly initialized WAL file to reach durable storage
<para> <para>
The <structname>pg_stat_bgwriter</structname> view will always have a The <structname>pg_stat_bgwriter</structname> view will always have a
single row, containing global data for the cluster. single row, containing data about the background writer of the cluster.
</para> </para>
<table id="pg-stat-bgwriter-view" xreflabel="pg_stat_bgwriter"> <table id="pg-stat-bgwriter-view" xreflabel="pg_stat_bgwriter">
@ -2886,54 +2895,6 @@ description | Waiting for a newly initialized WAL file to reach durable storage
</thead> </thead>
<tbody> <tbody>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>checkpoints_timed</structfield> <type>bigint</type>
</para>
<para>
Number of scheduled checkpoints that have been performed
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>checkpoints_req</structfield> <type>bigint</type>
</para>
<para>
Number of requested checkpoints that have been performed
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>checkpoint_write_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time that has been spent in the portion of
checkpoint processing where files are written to disk, in milliseconds
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>checkpoint_sync_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time that has been spent in the portion of
checkpoint processing where files are synchronized to disk, in
milliseconds
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>buffers_checkpoint</structfield> <type>bigint</type>
</para>
<para>
Number of buffers written during checkpoints
</para></entry>
</row>
<row> <row>
<entry role="catalog_table_entry"><para role="column_definition"> <entry role="catalog_table_entry"><para role="column_definition">
<structfield>buffers_clean</structfield> <type>bigint</type> <structfield>buffers_clean</structfield> <type>bigint</type>
@ -2976,6 +2937,95 @@ description | Waiting for a newly initialized WAL file to reach durable storage
</sect2> </sect2>
<sect2 id="monitoring-pg-stat-checkpointer-view">
<title><structname>pg_stat_checkpointer</structname></title>
<indexterm>
<primary>pg_stat_checkpointer</primary>
</indexterm>
<para>
The <structname>pg_stat_checkpointer</structname> view will always have a
single row, containing data about the checkpointer process of the cluster.
</para>
<table id="pg-stat-checkpointer-view" xreflabel="pg_stat_checkpointer">
<title><structname>pg_stat_checkpointer</structname> View</title>
<tgroup cols="1">
<thead>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
Column Type
</para>
<para>
Description
</para></entry>
</row>
</thead>
<tbody>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>num_timed</structfield> <type>bigint</type>
</para>
<para>
Number of scheduled checkpoints that have been performed
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>num_requested</structfield> <type>bigint</type>
</para>
<para>
Number of requested checkpoints that have been performed
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>write_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time that has been spent in the portion of
checkpoint processing where files are written to disk, in milliseconds
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>sync_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time that has been spent in the portion of
checkpoint processing where files are synchronized to disk, in
milliseconds
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>buffers_written</structfield> <type>bigint</type>
</para>
<para>
Number of buffers written during checkpoints
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>stats_reset</structfield> <type>timestamp with time zone</type>
</para>
<para>
Time at which these statistics were last reset
</para></entry>
</row>
</tbody>
</tgroup>
</table>
</sect2>
<sect2 id="monitoring-pg-stat-wal-view"> <sect2 id="monitoring-pg-stat-wal-view">
<title><structname>pg_stat_wal</structname></title> <title><structname>pg_stat_wal</structname></title>
@ -4669,8 +4719,10 @@ description | Waiting for a newly initialized WAL file to reach durable storage
Resets some cluster-wide statistics counters to zero, depending on the Resets some cluster-wide statistics counters to zero, depending on the
argument. The argument can be <literal>bgwriter</literal> to reset argument. The argument can be <literal>bgwriter</literal> to reset
all the counters shown in all the counters shown in
the <structname>pg_stat_bgwriter</structname> the <structname>pg_stat_bgwriter</structname> view,
view, <literal>archiver</literal> to reset all the counters shown in <literal>checkpointer</literal> to reset all the counters shown in
the <structname>pg_stat_checkpointer</structname> view,
<literal>archiver</literal> to reset all the counters shown in
the <structname>pg_stat_archiver</structname> view, the <structname>pg_stat_archiver</structname> view,
<literal>io</literal> to reset all the counters shown in the <literal>io</literal> to reset all the counters shown in the
<structname>pg_stat_io</structname> view, <structname>pg_stat_io</structname> view,

4
src/backend/access/transam/xlog.c
View File

@ -6349,8 +6349,8 @@ LogCheckpointEnd(bool restartpoint)
CheckpointStats.ckpt_sync_end_t); CheckpointStats.ckpt_sync_end_t);
/* Accumulate checkpoint timing summary data, in milliseconds. */ /* Accumulate checkpoint timing summary data, in milliseconds. */
PendingCheckpointerStats.checkpoint_write_time += write_msecs; PendingCheckpointerStats.write_time += write_msecs;
PendingCheckpointerStats.checkpoint_sync_time += sync_msecs; PendingCheckpointerStats.sync_time += sync_msecs;
/* /*
* All of the published timing statistics are accounted for. Only * All of the published timing statistics are accounted for. Only

14
src/backend/catalog/system_views.sql
View File

@ -1111,16 +1111,20 @@ CREATE VIEW pg_stat_archiver AS
CREATE VIEW pg_stat_bgwriter AS CREATE VIEW pg_stat_bgwriter AS
SELECT SELECT
pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed,
pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req,
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,
pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean, pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean,
pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean,
pg_stat_get_buf_alloc() AS buffers_alloc, pg_stat_get_buf_alloc() AS buffers_alloc,
pg_stat_get_bgwriter_stat_reset_time() AS stats_reset; pg_stat_get_bgwriter_stat_reset_time() AS stats_reset;
CREATE VIEW pg_stat_checkpointer AS
SELECT
pg_stat_get_checkpointer_num_timed() AS num_timed,
pg_stat_get_checkpointer_num_requested() AS num_requested,
pg_stat_get_checkpointer_write_time() AS write_time,
pg_stat_get_checkpointer_sync_time() AS sync_time,
pg_stat_get_checkpointer_buffers_written() AS buffers_written,
pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
CREATE VIEW pg_stat_io AS CREATE VIEW pg_stat_io AS
SELECT SELECT
b.backend_type, b.backend_type,

6
src/backend/postmaster/checkpointer.c
View File

@ -358,7 +358,7 @@ CheckpointerMain(void)
if (((volatile CheckpointerShmemStruct *) CheckpointerShmem)->ckpt_flags) if (((volatile CheckpointerShmemStruct *) CheckpointerShmem)->ckpt_flags)
{ {
do_checkpoint = true; do_checkpoint = true;
PendingCheckpointerStats.requested_checkpoints++; PendingCheckpointerStats.num_requested++;
} }
/* /*
@ -372,7 +372,7 @@ CheckpointerMain(void)
if (elapsed_secs >= CheckPointTimeout) if (elapsed_secs >= CheckPointTimeout)
{ {
if (!do_checkpoint) if (!do_checkpoint)
PendingCheckpointerStats.timed_checkpoints++; PendingCheckpointerStats.num_timed++;
do_checkpoint = true; do_checkpoint = true;
flags |= CHECKPOINT_CAUSE_TIME; flags |= CHECKPOINT_CAUSE_TIME;
} }
@ -569,7 +569,7 @@ HandleCheckpointerInterrupts(void)
* updates the statistics, increment the checkpoint request and flush * updates the statistics, increment the checkpoint request and flush
* out pending statistic. * out pending statistic.
*/ */
PendingCheckpointerStats.requested_checkpoints++; PendingCheckpointerStats.num_requested++;
ShutdownXLOG(0, 0); ShutdownXLOG(0, 0);
pgstat_report_checkpointer(); pgstat_report_checkpointer();
pgstat_report_wal(true); pgstat_report_wal(true);

2
src/backend/storage/buffer/bufmgr.c
View File

@ -2751,7 +2751,7 @@ BufferSync(int flags)
if (SyncOneBuffer(buf_id, false, &wb_context) & BUF_WRITTEN) if (SyncOneBuffer(buf_id, false, &wb_context) & BUF_WRITTEN)
{ {
TRACE_POSTGRESQL_BUFFER_SYNC_WRITTEN(buf_id); TRACE_POSTGRESQL_BUFFER_SYNC_WRITTEN(buf_id);
PendingCheckpointerStats.buf_written_checkpoints++; PendingCheckpointerStats.buffers_written++;
num_written++; num_written++;
} }
} }

21
src/backend/utils/activity/pgstat_checkpointer.c
View File

@ -47,11 +47,11 @@ pgstat_report_checkpointer(void)
pgstat_begin_changecount_write(&stats_shmem->changecount); pgstat_begin_changecount_write(&stats_shmem->changecount);
#define CHECKPOINTER_ACC(fld) stats_shmem->stats.fld += PendingCheckpointerStats.fld #define CHECKPOINTER_ACC(fld) stats_shmem->stats.fld += PendingCheckpointerStats.fld
CHECKPOINTER_ACC(timed_checkpoints); CHECKPOINTER_ACC(num_timed);
CHECKPOINTER_ACC(requested_checkpoints); CHECKPOINTER_ACC(num_requested);
CHECKPOINTER_ACC(checkpoint_write_time); CHECKPOINTER_ACC(write_time);
CHECKPOINTER_ACC(checkpoint_sync_time); CHECKPOINTER_ACC(sync_time);
CHECKPOINTER_ACC(buf_written_checkpoints); CHECKPOINTER_ACC(buffers_written);
#undef CHECKPOINTER_ACC #undef CHECKPOINTER_ACC
pgstat_end_changecount_write(&stats_shmem->changecount); pgstat_end_changecount_write(&stats_shmem->changecount);
@ -92,6 +92,7 @@ pgstat_checkpointer_reset_all_cb(TimestampTz ts)
&stats_shmem->stats, &stats_shmem->stats,
sizeof(stats_shmem->stats), sizeof(stats_shmem->stats),
&stats_shmem->changecount); &stats_shmem->changecount);
stats_shmem->stats.stat_reset_timestamp = ts;
LWLockRelease(&stats_shmem->lock); LWLockRelease(&stats_shmem->lock);
} }
@ -113,10 +114,10 @@ pgstat_checkpointer_snapshot_cb(void)
/* compensate by reset offsets */ /* compensate by reset offsets */
#define CHECKPOINTER_COMP(fld) pgStatLocal.snapshot.checkpointer.fld -= reset.fld; #define CHECKPOINTER_COMP(fld) pgStatLocal.snapshot.checkpointer.fld -= reset.fld;
CHECKPOINTER_COMP(timed_checkpoints); CHECKPOINTER_COMP(num_timed);
CHECKPOINTER_COMP(requested_checkpoints); CHECKPOINTER_COMP(num_requested);
CHECKPOINTER_COMP(checkpoint_write_time); CHECKPOINTER_COMP(write_time);
CHECKPOINTER_COMP(checkpoint_sync_time); CHECKPOINTER_COMP(sync_time);
CHECKPOINTER_COMP(buf_written_checkpoints); CHECKPOINTER_COMP(buffers_written);
#undef CHECKPOINTER_COMP #undef CHECKPOINTER_COMP
} }

35
src/backend/utils/adt/pgstatfuncs.c
View File

@ -1182,21 +1182,21 @@ PG_STAT_GET_DBENTRY_FLOAT8_MS(idle_in_transaction_time)
PG_STAT_GET_DBENTRY_FLOAT8_MS(session_time) PG_STAT_GET_DBENTRY_FLOAT8_MS(session_time)
Datum Datum
pg_stat_get_bgwriter_timed_checkpoints(PG_FUNCTION_ARGS) pg_stat_get_checkpointer_num_timed(PG_FUNCTION_ARGS)
{ {
PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->timed_checkpoints); PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->num_timed);
} }
Datum Datum
pg_stat_get_bgwriter_requested_checkpoints(PG_FUNCTION_ARGS) pg_stat_get_checkpointer_num_requested(PG_FUNCTION_ARGS)
{ {
PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->requested_checkpoints); PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->num_requested);
} }
Datum Datum
pg_stat_get_bgwriter_buf_written_checkpoints(PG_FUNCTION_ARGS) pg_stat_get_checkpointer_buffers_written(PG_FUNCTION_ARGS)
{ {
PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->buf_written_checkpoints); PG_RETURN_INT64(pgstat_fetch_stat_checkpointer()->buffers_written);
} }
Datum Datum
@ -1212,19 +1212,25 @@ pg_stat_get_bgwriter_maxwritten_clean(PG_FUNCTION_ARGS)
} }
Datum Datum
pg_stat_get_checkpoint_write_time(PG_FUNCTION_ARGS) pg_stat_get_checkpointer_write_time(PG_FUNCTION_ARGS)
{ {
/* time is already in msec, just convert to double for presentation */ /* time is already in msec, just convert to double for presentation */
PG_RETURN_FLOAT8((double) PG_RETURN_FLOAT8((double)
pgstat_fetch_stat_checkpointer()->checkpoint_write_time); pgstat_fetch_stat_checkpointer()->write_time);
} }
Datum Datum
pg_stat_get_checkpoint_sync_time(PG_FUNCTION_ARGS) pg_stat_get_checkpointer_sync_time(PG_FUNCTION_ARGS)
{ {
/* time is already in msec, just convert to double for presentation */ /* time is already in msec, just convert to double for presentation */
PG_RETURN_FLOAT8((double) PG_RETURN_FLOAT8((double)
pgstat_fetch_stat_checkpointer()->checkpoint_sync_time); pgstat_fetch_stat_checkpointer()->sync_time);
}
Datum
pg_stat_get_checkpointer_stat_reset_time(PG_FUNCTION_ARGS)
{
PG_RETURN_TIMESTAMPTZ(pgstat_fetch_stat_checkpointer()->stat_reset_timestamp);
} }
Datum Datum
@ -1684,14 +1690,9 @@ pg_stat_reset_shared(PG_FUNCTION_ARGS)
if (strcmp(target, "archiver") == 0) if (strcmp(target, "archiver") == 0)
pgstat_reset_of_kind(PGSTAT_KIND_ARCHIVER); pgstat_reset_of_kind(PGSTAT_KIND_ARCHIVER);
else if (strcmp(target, "bgwriter") == 0) else if (strcmp(target, "bgwriter") == 0)
{
/*
* Historically checkpointer was part of bgwriter, continue to reset
* both for now.
*/
pgstat_reset_of_kind(PGSTAT_KIND_BGWRITER); pgstat_reset_of_kind(PGSTAT_KIND_BGWRITER);
else if (strcmp(target, "checkpointer") == 0)
pgstat_reset_of_kind(PGSTAT_KIND_CHECKPOINTER); pgstat_reset_of_kind(PGSTAT_KIND_CHECKPOINTER);
}
else if (strcmp(target, "io") == 0) else if (strcmp(target, "io") == 0)
pgstat_reset_of_kind(PGSTAT_KIND_IO); pgstat_reset_of_kind(PGSTAT_KIND_IO);
else if (strcmp(target, "recovery_prefetch") == 0) else if (strcmp(target, "recovery_prefetch") == 0)
@ -1702,7 +1703,7 @@ pg_stat_reset_shared(PG_FUNCTION_ARGS)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("unrecognized reset target: \"%s\"", target), errmsg("unrecognized reset target: \"%s\"", target),
errhint("Target must be \"archiver\", \"bgwriter\", \"io\", \"recovery_prefetch\", or \"wal\"."))); errhint("Target must be \"archiver\", \"bgwriter\", \"checkpointer\", \"io\", \"recovery_prefetch\", or \"wal\".")));
PG_RETURN_VOID(); PG_RETURN_VOID();
} }

2
src/include/catalog/catversion.h
View File

@ -57,6 +57,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 202310271 #define CATALOG_VERSION_NO 202310301
#endif #endif

30
src/include/catalog/pg_proc.dat
View File

@ -5700,20 +5700,24 @@
proargnames => '{archived_count,last_archived_wal,last_archived_time,failed_count,last_failed_wal,last_failed_time,stats_reset}', proargnames => '{archived_count,last_archived_wal,last_archived_time,failed_count,last_failed_wal,last_failed_time,stats_reset}',
prosrc => 'pg_stat_get_archiver' }, prosrc => 'pg_stat_get_archiver' },
{ oid => '2769', { oid => '2769',
descr => 'statistics: number of timed checkpoints started by the bgwriter', descr => 'statistics: number of timed checkpoints started by the checkpointer',
proname => 'pg_stat_get_bgwriter_timed_checkpoints', provolatile => 's', proname => 'pg_stat_get_checkpointer_num_timed', provolatile => 's',
proparallel => 'r', prorettype => 'int8', proargtypes => '', proparallel => 'r', prorettype => 'int8', proargtypes => '',
prosrc => 'pg_stat_get_bgwriter_timed_checkpoints' }, prosrc => 'pg_stat_get_checkpointer_num_timed' },
{ oid => '2770', { oid => '2770',
descr => 'statistics: number of backend requested checkpoints started by the bgwriter', descr => 'statistics: number of backend requested checkpoints started by the checkpointer',
proname => 'pg_stat_get_bgwriter_requested_checkpoints', provolatile => 's', proname => 'pg_stat_get_checkpointer_num_requested', provolatile => 's',
proparallel => 'r', prorettype => 'int8', proargtypes => '', proparallel => 'r', prorettype => 'int8', proargtypes => '',
prosrc => 'pg_stat_get_bgwriter_requested_checkpoints' }, prosrc => 'pg_stat_get_checkpointer_num_requested' },
{ oid => '2771', { oid => '2771',
descr => 'statistics: number of buffers written by the bgwriter during checkpoints', descr => 'statistics: number of buffers written by the checkpointer',
proname => 'pg_stat_get_bgwriter_buf_written_checkpoints', provolatile => 's', proname => 'pg_stat_get_checkpointer_buffers_written', provolatile => 's',
proparallel => 'r', prorettype => 'int8', proargtypes => '', proparallel => 'r', prorettype => 'int8', proargtypes => '',
prosrc => 'pg_stat_get_bgwriter_buf_written_checkpoints' }, prosrc => 'pg_stat_get_checkpointer_buffers_written' },
{ oid => '8206', descr => 'statistics: last reset for the checkpointer',
proname => 'pg_stat_get_checkpointer_stat_reset_time', provolatile => 's',
proparallel => 'r', prorettype => 'timestamptz', proargtypes => '',
prosrc => 'pg_stat_get_checkpointer_stat_reset_time' },
{ oid => '2772', { oid => '2772',
descr => 'statistics: number of buffers written by the bgwriter for cleaning dirty buffers', descr => 'statistics: number of buffers written by the bgwriter for cleaning dirty buffers',
proname => 'pg_stat_get_bgwriter_buf_written_clean', provolatile => 's', proname => 'pg_stat_get_bgwriter_buf_written_clean', provolatile => 's',
@ -5730,14 +5734,14 @@
prosrc => 'pg_stat_get_bgwriter_stat_reset_time' }, prosrc => 'pg_stat_get_bgwriter_stat_reset_time' },
{ oid => '3160', { oid => '3160',
descr => 'statistics: checkpoint time spent writing buffers to disk, in milliseconds', descr => 'statistics: checkpoint time spent writing buffers to disk, in milliseconds',
proname => 'pg_stat_get_checkpoint_write_time', provolatile => 's', proname => 'pg_stat_get_checkpointer_write_time', provolatile => 's',
proparallel => 'r', prorettype => 'float8', proargtypes => '', proparallel => 'r', prorettype => 'float8', proargtypes => '',
prosrc => 'pg_stat_get_checkpoint_write_time' }, prosrc => 'pg_stat_get_checkpointer_write_time' },
{ oid => '3161', { oid => '3161',
descr => 'statistics: checkpoint time spent synchronizing buffers to disk, in milliseconds', descr => 'statistics: checkpoint time spent synchronizing buffers to disk, in milliseconds',
proname => 'pg_stat_get_checkpoint_sync_time', provolatile => 's', proname => 'pg_stat_get_checkpointer_sync_time', provolatile => 's',
proparallel => 'r', prorettype => 'float8', proargtypes => '', proparallel => 'r', prorettype => 'float8', proargtypes => '',
prosrc => 'pg_stat_get_checkpoint_sync_time' }, prosrc => 'pg_stat_get_checkpointer_sync_time' },
{ oid => '2859', descr => 'statistics: number of buffer allocations', { oid => '2859', descr => 'statistics: number of buffer allocations',
proname => 'pg_stat_get_buf_alloc', provolatile => 's', proparallel => 'r', proname => 'pg_stat_get_buf_alloc', provolatile => 's', proparallel => 'r',
prorettype => 'int8', proargtypes => '', prosrc => 'pg_stat_get_buf_alloc' }, prorettype => 'int8', proargtypes => '', prosrc => 'pg_stat_get_buf_alloc' },

11
src/include/pgstat.h
View File

@ -260,11 +260,12 @@ typedef struct PgStat_BgWriterStats
typedef struct PgStat_CheckpointerStats typedef struct PgStat_CheckpointerStats
{ {
PgStat_Counter timed_checkpoints; PgStat_Counter num_timed;
PgStat_Counter requested_checkpoints; PgStat_Counter num_requested;
PgStat_Counter checkpoint_write_time; /* times in milliseconds */ PgStat_Counter write_time; /* times in milliseconds */
PgStat_Counter checkpoint_sync_time; PgStat_Counter sync_time;
PgStat_Counter buf_written_checkpoints; PgStat_Counter buffers_written;
TimestampTz stat_reset_timestamp;
} PgStat_CheckpointerStats; } PgStat_CheckpointerStats;

6
src/test/recovery/t/029_stats_restart.pl
View File

@ -173,7 +173,7 @@ is($wal_start->{reset}, $wal_restart->{reset},
## Check that checkpoint stats are reset, WAL stats aren't affected ## Check that checkpoint stats are reset, WAL stats aren't affected
$node->safe_psql($connect_db, "SELECT pg_stat_reset_shared('bgwriter')"); $node->safe_psql($connect_db, "SELECT pg_stat_reset_shared('checkpointer')");
$sect = "post ckpt reset"; $sect = "post ckpt reset";
my $ckpt_reset = checkpoint_stats(); my $ckpt_reset = checkpoint_stats();
@ -323,9 +323,9 @@ sub checkpoint_stats
my %results; my %results;
$results{count} = $node->safe_psql($connect_db, $results{count} = $node->safe_psql($connect_db,
"SELECT checkpoints_timed + checkpoints_req FROM pg_stat_bgwriter"); "SELECT num_timed + num_requested FROM pg_stat_checkpointer");
$results{reset} = $node->safe_psql($connect_db, $results{reset} = $node->safe_psql($connect_db,
"SELECT stats_reset FROM pg_stat_bgwriter"); "SELECT stats_reset FROM pg_stat_checkpointer");
return \%results; return \%results;
} }

13
src/test/regress/expected/rules.out
View File

@ -1816,15 +1816,16 @@ pg_stat_archiver| SELECT archived_count,
last_failed_time, last_failed_time,
stats_reset stats_reset
FROM pg_stat_get_archiver() s(archived_count, last_archived_wal, last_archived_time, failed_count, last_failed_wal, last_failed_time, stats_reset); FROM pg_stat_get_archiver() s(archived_count, last_archived_wal, last_archived_time, failed_count, last_failed_wal, last_failed_time, stats_reset);
pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed, pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean,
pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req,
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,
pg_stat_get_bgwriter_buf_written_clean() AS buffers_clean,
pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean, pg_stat_get_bgwriter_maxwritten_clean() AS maxwritten_clean,
pg_stat_get_buf_alloc() AS buffers_alloc, pg_stat_get_buf_alloc() AS buffers_alloc,
pg_stat_get_bgwriter_stat_reset_time() AS stats_reset; pg_stat_get_bgwriter_stat_reset_time() AS stats_reset;
pg_stat_checkpointer| SELECT pg_stat_get_checkpointer_num_timed() AS num_timed,
pg_stat_get_checkpointer_num_requested() AS num_requested,
pg_stat_get_checkpointer_write_time() AS write_time,
pg_stat_get_checkpointer_sync_time() AS sync_time,
pg_stat_get_checkpointer_buffers_written() AS buffers_written,
pg_stat_get_checkpointer_stat_reset_time() AS stats_reset;
pg_stat_database| SELECT oid AS datid, pg_stat_database| SELECT oid AS datid,
datname, datname,
CASE CASE

27
src/test/regress/expected/stats.out
View File

@ -828,8 +828,8 @@ SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELEC
t t
(1 row) (1 row)
-- Test pg_stat_bgwriter checkpointer-related stats, together with pg_stat_wal -- Test pg_stat_checkpointer checkpointer-related stats, together with pg_stat_wal
SELECT checkpoints_req AS rqst_ckpts_before FROM pg_stat_bgwriter \gset SELECT num_requested AS rqst_ckpts_before FROM pg_stat_checkpointer \gset
-- Test pg_stat_wal (and make a temp table so our temp schema exists) -- Test pg_stat_wal (and make a temp table so our temp schema exists)
SELECT wal_bytes AS wal_bytes_before FROM pg_stat_wal \gset SELECT wal_bytes AS wal_bytes_before FROM pg_stat_wal \gset
CREATE TEMP TABLE test_stats_temp AS SELECT 17; CREATE TEMP TABLE test_stats_temp AS SELECT 17;
@ -839,7 +839,7 @@ DROP TABLE test_stats_temp;
-- results of the first. -- results of the first.
CHECKPOINT; CHECKPOINT;
CHECKPOINT; CHECKPOINT;
SELECT checkpoints_req > :rqst_ckpts_before FROM pg_stat_bgwriter; SELECT num_requested > :rqst_ckpts_before FROM pg_stat_checkpointer;
?column? ?column?
---------- ----------
t t
@ -930,6 +930,21 @@ SELECT stats_reset > :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter;
(1 row) (1 row)
SELECT stats_reset AS bgwriter_reset_ts FROM pg_stat_bgwriter \gset SELECT stats_reset AS bgwriter_reset_ts FROM pg_stat_bgwriter \gset
-- Test that reset_shared with checkpointer specified as the stats type works
SELECT stats_reset AS checkpointer_reset_ts FROM pg_stat_checkpointer \gset
SELECT pg_stat_reset_shared('checkpointer');
pg_stat_reset_shared
----------------------
(1 row)
SELECT stats_reset > :'checkpointer_reset_ts'::timestamptz FROM pg_stat_checkpointer;
?column?
----------
t
(1 row)
SELECT stats_reset AS checkpointer_reset_ts FROM pg_stat_checkpointer \gset
-- Test that reset_shared with wal specified as the stats type works -- Test that reset_shared with wal specified as the stats type works
SELECT stats_reset AS wal_reset_ts FROM pg_stat_wal \gset SELECT stats_reset AS wal_reset_ts FROM pg_stat_wal \gset
SELECT pg_stat_reset_shared('wal'); SELECT pg_stat_reset_shared('wal');
@ -964,6 +979,12 @@ SELECT stats_reset = :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter;
t t
(1 row) (1 row)
SELECT stats_reset = :'checkpointer_reset_ts'::timestamptz FROM pg_stat_checkpointer;
?column?
----------
t
(1 row)
SELECT stats_reset = :'wal_reset_ts'::timestamptz FROM pg_stat_wal; SELECT stats_reset = :'wal_reset_ts'::timestamptz FROM pg_stat_wal;
?column? ?column?
---------- ----------

13
src/test/regress/sql/stats.sql
View File

@ -417,8 +417,8 @@ SELECT sessions AS db_stat_sessions FROM pg_stat_database WHERE datname = (SELEC
SELECT pg_stat_force_next_flush(); SELECT pg_stat_force_next_flush();
SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database()); SELECT sessions > :db_stat_sessions FROM pg_stat_database WHERE datname = (SELECT current_database());
-- Test pg_stat_bgwriter checkpointer-related stats, together with pg_stat_wal -- Test pg_stat_checkpointer checkpointer-related stats, together with pg_stat_wal
SELECT checkpoints_req AS rqst_ckpts_before FROM pg_stat_bgwriter \gset SELECT num_requested AS rqst_ckpts_before FROM pg_stat_checkpointer \gset
-- Test pg_stat_wal (and make a temp table so our temp schema exists) -- Test pg_stat_wal (and make a temp table so our temp schema exists)
SELECT wal_bytes AS wal_bytes_before FROM pg_stat_wal \gset SELECT wal_bytes AS wal_bytes_before FROM pg_stat_wal \gset
@ -432,7 +432,7 @@ DROP TABLE test_stats_temp;
CHECKPOINT; CHECKPOINT;
CHECKPOINT; CHECKPOINT;
SELECT checkpoints_req > :rqst_ckpts_before FROM pg_stat_bgwriter; SELECT num_requested > :rqst_ckpts_before FROM pg_stat_checkpointer;
SELECT wal_bytes > :wal_bytes_before FROM pg_stat_wal; SELECT wal_bytes > :wal_bytes_before FROM pg_stat_wal;
-- Test pg_stat_get_backend_idset() and some allied functions. -- Test pg_stat_get_backend_idset() and some allied functions.
@ -470,6 +470,12 @@ SELECT pg_stat_reset_shared('bgwriter');
SELECT stats_reset > :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter; SELECT stats_reset > :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter;
SELECT stats_reset AS bgwriter_reset_ts FROM pg_stat_bgwriter \gset SELECT stats_reset AS bgwriter_reset_ts FROM pg_stat_bgwriter \gset
-- Test that reset_shared with checkpointer specified as the stats type works
SELECT stats_reset AS checkpointer_reset_ts FROM pg_stat_checkpointer \gset
SELECT pg_stat_reset_shared('checkpointer');
SELECT stats_reset > :'checkpointer_reset_ts'::timestamptz FROM pg_stat_checkpointer;
SELECT stats_reset AS checkpointer_reset_ts FROM pg_stat_checkpointer \gset
-- Test that reset_shared with wal specified as the stats type works -- Test that reset_shared with wal specified as the stats type works
SELECT stats_reset AS wal_reset_ts FROM pg_stat_wal \gset SELECT stats_reset AS wal_reset_ts FROM pg_stat_wal \gset
SELECT pg_stat_reset_shared('wal'); SELECT pg_stat_reset_shared('wal');
@ -480,6 +486,7 @@ SELECT stats_reset AS wal_reset_ts FROM pg_stat_wal \gset
SELECT pg_stat_reset_shared(NULL); SELECT pg_stat_reset_shared(NULL);
SELECT stats_reset = :'archiver_reset_ts'::timestamptz FROM pg_stat_archiver; SELECT stats_reset = :'archiver_reset_ts'::timestamptz FROM pg_stat_archiver;
SELECT stats_reset = :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter; SELECT stats_reset = :'bgwriter_reset_ts'::timestamptz FROM pg_stat_bgwriter;
SELECT stats_reset = :'checkpointer_reset_ts'::timestamptz FROM pg_stat_checkpointer;
SELECT stats_reset = :'wal_reset_ts'::timestamptz FROM pg_stat_wal; SELECT stats_reset = :'wal_reset_ts'::timestamptz FROM pg_stat_wal;
-- Test that reset works for pg_stat_database -- Test that reset works for pg_stat_database