database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-27 23:21:58 +03:00
Code Activity

Remove read/sync fields from pg_stat_wal and GUC track_wal_io_timing

Browse Source 
The four following attributes are removed from pg_stat_wal:
* wal_write
* wal_sync
* wal_write_time
* wal_sync_time

a051e71e28 has added an equivalent of this information in pg_stat_io
with more granularity as this now spreads across the backend types, IO
context and IO objects.  So, keeping the same information in pg_stat_wal
has little benefits.

Another benefit of this commit is the removal of PendingWalStats,
simplifying an upcoming patch to add per-backend WAL statistics, which
already support IO statistics and which have access to the write/sync
stats data of WAL.

The GUC track_wal_io_timing, that was used to enable or disable the
aggregation of the write and sync timings for WAL, is also removed.
pgstat_prepare_io_time() is simplified.

Bump catalog version.
Bump PGSTAT_FILE_FORMAT_ID, due to the update of PgStat_WalStats.

Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Discussion: https://postgr.es/m/Z7RkQ0EfYaqqjgz/@ip-10-97-1-34.eu-west-3.compute.internal
This commit is contained in:
Michael Paquier
2025-02-24 09:51:56 +09:00
parent fc0d0ce978
commit 2421e9a51d
20 changed files with 32 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
doc/src/sgml/config.sgml
View File

@ -8393,28 +8393,6 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry id="guc-track-wal-io-timing" xreflabel="track_wal_io_timing">
<term><varname>track_wal_io_timing</varname> (<type>boolean</type>)
<indexterm>
<primary><varname>track_wal_io_timing</varname> configuration parameter</primary>
</indexterm>
</term>
<listitem>
<para>
Enables timing of WAL I/O calls. This parameter is off by default,
as it will repeatedly query the operating system for the current time,
which may cause significant overhead on some platforms.
You can use the <application>pg_test_timing</application> tool to
measure the overhead of timing on your system.
I/O timing information is
displayed in <link linkend="monitoring-pg-stat-wal-view">
<structname>pg_stat_wal</structname></link>.
Only superusers and users with the appropriate <literal>SET</literal>
privilege can change this setting.
</para>
</listitem>
</varlistentry>
<varlistentry id="guc-track-functions" xreflabel="track_functions"> <varlistentry id="guc-track-functions" xreflabel="track_functions">
<term><varname>track_functions</varname> (<type>enum</type>) <term><varname>track_functions</varname> (<type>enum</type>)
<indexterm> <indexterm>

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

@ -183,11 +183,6 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
of block read, write, extend, and fsync times. of block read, write, extend, and fsync times.
</para> </para>
<para>
The parameter <xref linkend="guc-track-wal-io-timing"/> enables monitoring
of WAL write and fsync times.
</para>
<para> <para>
Normally these parameters are set in <filename>postgresql.conf</filename> so Normally these parameters are set in <filename>postgresql.conf</filename> so
that they apply to all server processes, but it is possible to turn that they apply to all server processes, but it is possible to turn
@ -3265,63 +3260,6 @@ description | Waiting for a newly initialized WAL file to reach durable storage
</para></entry> </para></entry>
</row> </row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>wal_write</structfield> <type>bigint</type>
</para>
<para>
Number of times WAL buffers were written out to disk via
<function>XLogWrite</function> request.
See <xref linkend="wal-configuration"/> for more information about
the internal WAL function <function>XLogWrite</function>.
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>wal_sync</structfield> <type>bigint</type>
</para>
<para>
Number of times WAL files were synced to disk via
<function>issue_xlog_fsync</function> request
(if <xref linkend="guc-fsync"/> is <literal>on</literal> and
<xref linkend="guc-wal-sync-method"/> is either
<literal>fdatasync</literal>, <literal>fsync</literal> or
<literal>fsync_writethrough</literal>, otherwise zero).
See <xref linkend="wal-configuration"/> for more information about
the internal WAL function <function>issue_xlog_fsync</function>.
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>wal_write_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time spent writing WAL buffers to disk via
<function>XLogWrite</function> request, in milliseconds
(if <xref linkend="guc-track-wal-io-timing"/> is enabled,
otherwise zero). This includes the sync time when
<varname>wal_sync_method</varname> is either
<literal>open_datasync</literal> or <literal>open_sync</literal>.
</para></entry>
</row>
<row>
<entry role="catalog_table_entry"><para role="column_definition">
<structfield>wal_sync_time</structfield> <type>double precision</type>
</para>
<para>
Total amount of time spent syncing WAL files to disk via
<function>issue_xlog_fsync</function> request, in milliseconds
(if <varname>track_wal_io_timing</varname> is enabled,
<varname>fsync</varname> is <literal>on</literal>, and
<varname>wal_sync_method</varname> is either
<literal>fdatasync</literal>, <literal>fsync</literal> or
<literal>fsync_writethrough</literal>, otherwise zero).
</para></entry>
</row>
<row> <row>
<entry role="catalog_table_entry"><para role="column_definition"> <entry role="catalog_table_entry"><para role="column_definition">
<structfield>stats_reset</structfield> <type>timestamp with time zone</type> <structfield>stats_reset</structfield> <type>timestamp with time zone</type>

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

@ -134,7 +134,6 @@ int CommitSiblings = 5; /* # concurrent xacts needed to sleep */
int wal_retrieve_retry_interval = 5000; int wal_retrieve_retry_interval = 5000;
int max_slot_wal_keep_size_mb = -1; int max_slot_wal_keep_size_mb = -1;
int wal_decode_buffer_size = 512 * 1024; int wal_decode_buffer_size = 512 * 1024;
bool track_wal_io_timing = false;
#ifdef WAL_DEBUG #ifdef WAL_DEBUG
bool XLOG_DEBUG = false; bool XLOG_DEBUG = false;
@ -2436,10 +2435,9 @@ XLogWrite(XLogwrtRqst WriteRqst, TimeLineID tli, bool flexible)
errno = 0; errno = 0;
/* /*
* Measure I/O timing to write WAL data, for pg_stat_io and/or * Measure I/O timing to write WAL data, for pg_stat_io.
* pg_stat_wal.
*/ */
start = pgstat_prepare_io_time(track_io_timing || track_wal_io_timing); start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_WRITE); pgstat_report_wait_start(WAIT_EVENT_WAL_WRITE);
written = pg_pwrite(openLogFile, from, nleft, startoffset); written = pg_pwrite(openLogFile, from, nleft, startoffset);
@ -2448,20 +2446,6 @@ XLogWrite(XLogwrtRqst WriteRqst, TimeLineID tli, bool flexible)
pgstat_count_io_op_time(IOOBJECT_WAL, IOCONTEXT_NORMAL, pgstat_count_io_op_time(IOOBJECT_WAL, IOCONTEXT_NORMAL,
IOOP_WRITE, start, 1, written); IOOP_WRITE, start, 1, written);
/*
* Increment the I/O timing and the number of times WAL data
* were written out to disk.
*/
if (track_wal_io_timing)
{
instr_time end;
INSTR_TIME_SET_CURRENT(end);
INSTR_TIME_ACCUM_DIFF(PendingWalStats.wal_write_time, end, start);
}
PendingWalStats.wal_write++;
if (written <= 0) if (written <= 0)
{ {
char xlogfname[MAXFNAMELEN]; char xlogfname[MAXFNAMELEN];
@ -3264,7 +3248,7 @@ XLogFileInitInternal(XLogSegNo logsegno, TimeLineID logtli,
errmsg("could not create file \"%s\": %m", tmppath))); errmsg("could not create file \"%s\": %m", tmppath)));
/* Measure I/O timing when initializing segment */ /* Measure I/O timing when initializing segment */
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_WRITE); pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_WRITE);
save_errno = 0; save_errno = 0;
@ -3326,7 +3310,7 @@ XLogFileInitInternal(XLogSegNo logsegno, TimeLineID logtli,
} }
/* Measure I/O timing when flushing segment */ /* Measure I/O timing when flushing segment */
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_SYNC); pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_SYNC);
if (pg_fsync(fd) != 0) if (pg_fsync(fd) != 0)
@ -8758,10 +8742,9 @@ issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli)
return; return;
/* /*
* Measure I/O timing to sync the WAL file for pg_stat_io and/or * Measure I/O timing to sync the WAL file for pg_stat_io.
* pg_stat_wal.
*/ */
start = pgstat_prepare_io_time(track_io_timing || track_wal_io_timing); start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_SYNC); pgstat_report_wait_start(WAIT_EVENT_WAL_SYNC);
switch (wal_sync_method) switch (wal_sync_method)
@ -8807,21 +8790,8 @@ issue_xlog_fsync(int fd, XLogSegNo segno, TimeLineID tli)
pgstat_report_wait_end(); pgstat_report_wait_end();
/*
* Increment the I/O timing and the number of times WAL files were synced.
*/
if (track_wal_io_timing)
{
instr_time end;
INSTR_TIME_SET_CURRENT(end);
INSTR_TIME_ACCUM_DIFF(PendingWalStats.wal_sync_time, end, start);
}
pgstat_count_io_op_time(IOOBJECT_WAL, IOCONTEXT_NORMAL, IOOP_FSYNC, pgstat_count_io_op_time(IOOBJECT_WAL, IOCONTEXT_NORMAL, IOOP_FSYNC,
start, 1, 0); start, 1, 0);
PendingWalStats.wal_sync++;
} }
/* /*

2
src/backend/access/transam/xlogreader.c
View File

@ -1557,7 +1557,7 @@ WALRead(XLogReaderState *state,
#ifndef FRONTEND #ifndef FRONTEND
/* Measure I/O timing when reading segment */ /* Measure I/O timing when reading segment */
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_READ); pgstat_report_wait_start(WAIT_EVENT_WAL_READ);
#endif #endif

2
src/backend/access/transam/xlogrecovery.c
View File

@ -3401,7 +3401,7 @@ retry:
readOff = targetPageOff; readOff = targetPageOff;
/* Measure I/O timing when reading segment */ /* Measure I/O timing when reading segment */
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
pgstat_report_wait_start(WAIT_EVENT_WAL_READ); pgstat_report_wait_start(WAIT_EVENT_WAL_READ);
r = pg_pread(readFile, readBuf, XLOG_BLCKSZ, (off_t) readOff); r = pg_pread(readFile, readBuf, XLOG_BLCKSZ, (off_t) readOff);

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

@ -1189,10 +1189,6 @@ CREATE VIEW pg_stat_wal AS
w.wal_fpi, w.wal_fpi,
w.wal_bytes, w.wal_bytes,
w.wal_buffers_full, w.wal_buffers_full,
w.wal_write,
w.wal_sync,
w.wal_write_time,
w.wal_sync_time,
w.stats_reset w.stats_reset
FROM pg_stat_get_wal() w; FROM pg_stat_get_wal() w;

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

@ -1509,7 +1509,7 @@ WaitReadBuffers(ReadBuffersOperation *operation)
io_pages[io_buffers_len++] = BufferGetBlock(buffers[i]); io_pages[io_buffers_len++] = BufferGetBlock(buffers[i]);
} }
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
smgrreadv(operation->smgr, forknum, io_first_block, io_pages, io_buffers_len); smgrreadv(operation->smgr, forknum, io_first_block, io_pages, io_buffers_len);
pgstat_count_io_op_time(io_object, io_context, IOOP_READ, io_start, pgstat_count_io_op_time(io_object, io_context, IOOP_READ, io_start,
1, io_buffers_len * BLCKSZ); 1, io_buffers_len * BLCKSZ);
@ -2401,7 +2401,7 @@ ExtendBufferedRelShared(BufferManagerRelation bmr,
} }
} }
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* /*
* Note: if smgrzeroextend fails, we will end up with buffers that are * Note: if smgrzeroextend fails, we will end up with buffers that are
@ -3858,7 +3858,7 @@ FlushBuffer(BufferDesc *buf, SMgrRelation reln, IOObject io_object,
*/ */
bufToWrite = PageSetChecksumCopy((Page) bufBlock, buf->tag.blockNum); bufToWrite = PageSetChecksumCopy((Page) bufBlock, buf->tag.blockNum);
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* /*
* bufToWrite is either the shared buffer or a copy, as appropriate. * bufToWrite is either the shared buffer or a copy, as appropriate.
@ -4460,7 +4460,7 @@ FlushRelationBuffers(Relation rel)
PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); PageSetChecksumInplace(localpage, bufHdr->tag.blockNum);
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
smgrwrite(srel, smgrwrite(srel,
BufTagGetForkNum(&bufHdr->tag), BufTagGetForkNum(&bufHdr->tag),
@ -5917,7 +5917,7 @@ IssuePendingWritebacks(WritebackContext *wb_context, IOContext io_context)
sort_pending_writebacks(wb_context->pending_writebacks, sort_pending_writebacks(wb_context->pending_writebacks,
wb_context->nr_pending); wb_context->nr_pending);
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* /*
* Coalesce neighbouring writes, but nothing else. For that we iterate * Coalesce neighbouring writes, but nothing else. For that we iterate

4
src/backend/storage/buffer/localbuf.c
View File

@ -244,7 +244,7 @@ GetLocalVictimBuffer(void)
PageSetChecksumInplace(localpage, bufHdr->tag.blockNum); PageSetChecksumInplace(localpage, bufHdr->tag.blockNum);
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* And write... */ /* And write... */
smgrwrite(oreln, smgrwrite(oreln,
@ -414,7 +414,7 @@ ExtendBufferedRelLocal(BufferManagerRelation bmr,
} }
} }
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* actually extend relation */ /* actually extend relation */
smgrzeroextend(bmr.smgr, fork, first_block, extend_by, false); smgrzeroextend(bmr.smgr, fork, first_block, extend_by, false);

4
src/backend/storage/smgr/md.c
View File

@ -1381,7 +1381,7 @@ register_dirty_segment(SMgrRelation reln, ForkNumber forknum, MdfdVec *seg)
ereport(DEBUG1, ereport(DEBUG1,
(errmsg_internal("could not forward fsync request because request queue is full"))); (errmsg_internal("could not forward fsync request because request queue is full")));
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
if (FileSync(seg->mdfd_vfd, WAIT_EVENT_DATA_FILE_SYNC) < 0) if (FileSync(seg->mdfd_vfd, WAIT_EVENT_DATA_FILE_SYNC) < 0)
ereport(data_sync_elevel(ERROR), ereport(data_sync_elevel(ERROR),
@ -1786,7 +1786,7 @@ mdsyncfiletag(const FileTag *ftag, char *path)
need_to_close = true; need_to_close = true;
} }
io_start = pgstat_prepare_io_time(track_io_timing); io_start = pgstat_prepare_io_time();
/* Sync the file. */ /* Sync the file. */
result = FileSync(file, WAIT_EVENT_DATA_FILE_SYNC); result = FileSync(file, WAIT_EVENT_DATA_FILE_SYNC);

7
src/backend/utils/activity/pgstat_io.c
View File

@ -83,15 +83,14 @@ pgstat_count_io_op(IOObject io_object, IOContext io_context, IOOp io_op,
} }
/* /*
* Initialize the internal timing for an IO operation, depending on an * Initialize the internal timing for an IO operation.
* IO timing GUC.
*/ */
instr_time instr_time
pgstat_prepare_io_time(bool track_io_guc) pgstat_prepare_io_time(void)
{ {
instr_time io_start; instr_time io_start;
if (track_io_guc) if (track_io_timing)
INSTR_TIME_SET_CURRENT(io_start); INSTR_TIME_SET_CURRENT(io_start);
else else
{ {

24
src/backend/utils/activity/pgstat_wal.c
View File

@ -21,8 +21,6 @@
#include "utils/pgstat_internal.h" #include "utils/pgstat_internal.h"
PgStat_PendingWalStats PendingWalStats = {0};
/* /*
* WAL usage counters saved from pgWalUsage at the previous call to * WAL usage counters saved from pgWalUsage at the previous call to
* pgstat_report_wal(). This is used to calculate how much WAL usage * pgstat_report_wal(). This is used to calculate how much WAL usage
@ -118,17 +116,10 @@ pgstat_wal_flush_cb(bool nowait)
#define WALSTAT_ACC(fld, var_to_add) \ #define WALSTAT_ACC(fld, var_to_add) \
(stats_shmem->stats.fld += var_to_add.fld) (stats_shmem->stats.fld += var_to_add.fld)
#define WALSTAT_ACC_INSTR_TIME(fld) \
(stats_shmem->stats.fld += INSTR_TIME_GET_MICROSEC(PendingWalStats.fld))
WALSTAT_ACC(wal_records, wal_usage_diff); WALSTAT_ACC(wal_records, wal_usage_diff);
WALSTAT_ACC(wal_fpi, wal_usage_diff); WALSTAT_ACC(wal_fpi, wal_usage_diff);
WALSTAT_ACC(wal_bytes, wal_usage_diff); WALSTAT_ACC(wal_bytes, wal_usage_diff);
WALSTAT_ACC(wal_buffers_full, wal_usage_diff); WALSTAT_ACC(wal_buffers_full, wal_usage_diff);
WALSTAT_ACC(wal_write, PendingWalStats);
WALSTAT_ACC(wal_sync, PendingWalStats);
WALSTAT_ACC_INSTR_TIME(wal_write_time);
WALSTAT_ACC_INSTR_TIME(wal_sync_time);
#undef WALSTAT_ACC_INSTR_TIME
#undef WALSTAT_ACC #undef WALSTAT_ACC
LWLockRelease(&stats_shmem->lock); LWLockRelease(&stats_shmem->lock);
@ -138,11 +129,6 @@ pgstat_wal_flush_cb(bool nowait)
*/ */
prevWalUsage = pgWalUsage; prevWalUsage = pgWalUsage;
/*
* Clear out the statistics buffer, so it can be re-used.
*/
MemSet(&PendingWalStats, 0, sizeof(PendingWalStats));
return false; return false;
} }
@ -158,18 +144,12 @@ pgstat_wal_init_backend_cb(void)
} }
/* /*
* To determine whether any WAL activity has occurred since last time, not * To determine whether WAL usage happened.
* only the number of generated WAL records but also the numbers of WAL
* writes and syncs need to be checked. Because even transaction that
* generates no WAL records can write or sync WAL data when flushing the
* data pages.
*/ */
bool bool
pgstat_wal_have_pending_cb(void) pgstat_wal_have_pending_cb(void)
{ {
return pgWalUsage.wal_records != prevWalUsage.wal_records || return pgWalUsage.wal_records != prevWalUsage.wal_records;
PendingWalStats.wal_write != 0 ||
PendingWalStats.wal_sync != 0;
} }
void void

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

@ -1637,7 +1637,7 @@ pg_stat_get_backend_io(PG_FUNCTION_ARGS)
Datum Datum
pg_stat_get_wal(PG_FUNCTION_ARGS) pg_stat_get_wal(PG_FUNCTION_ARGS)
{ {
#define PG_STAT_GET_WAL_COLS 9 #define PG_STAT_GET_WAL_COLS 5
TupleDesc tupdesc; TupleDesc tupdesc;
Datum values[PG_STAT_GET_WAL_COLS] = {0}; Datum values[PG_STAT_GET_WAL_COLS] = {0};
bool nulls[PG_STAT_GET_WAL_COLS] = {0}; bool nulls[PG_STAT_GET_WAL_COLS] = {0};
@ -1654,15 +1654,7 @@ pg_stat_get_wal(PG_FUNCTION_ARGS)
NUMERICOID, -1, 0); NUMERICOID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_buffers_full", TupleDescInitEntry(tupdesc, (AttrNumber) 4, "wal_buffers_full",
INT8OID, -1, 0); INT8OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 5, "wal_write", TupleDescInitEntry(tupdesc, (AttrNumber) 5, "stats_reset",
INT8OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 6, "wal_sync",
INT8OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 7, "wal_write_time",
FLOAT8OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 8, "wal_sync_time",
FLOAT8OID, -1, 0);
TupleDescInitEntry(tupdesc, (AttrNumber) 9, "stats_reset",
TIMESTAMPTZOID, -1, 0); TIMESTAMPTZOID, -1, 0);
BlessTupleDesc(tupdesc); BlessTupleDesc(tupdesc);
@ -1682,14 +1674,8 @@ pg_stat_get_wal(PG_FUNCTION_ARGS)
Int32GetDatum(-1)); Int32GetDatum(-1));
values[3] = Int64GetDatum(wal_stats->wal_buffers_full); values[3] = Int64GetDatum(wal_stats->wal_buffers_full);
values[4] = Int64GetDatum(wal_stats->wal_write);
values[5] = Int64GetDatum(wal_stats->wal_sync);
/* Convert counters from microsec to millisec for display */ values[4] = TimestampTzGetDatum(wal_stats->stat_reset_timestamp);
values[6] = Float8GetDatum(((double) wal_stats->wal_write_time) / 1000.0);
values[7] = Float8GetDatum(((double) wal_stats->wal_sync_time) / 1000.0);
values[8] = TimestampTzGetDatum(wal_stats->stat_reset_timestamp);
/* Returns the record as Datum */ /* Returns the record as Datum */
PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(tupdesc, values, nulls))); PG_RETURN_DATUM(HeapTupleGetDatum(heap_form_tuple(tupdesc, values, nulls)));

9
src/backend/utils/misc/guc_tables.c
View File

@ -1500,15 +1500,6 @@ struct config_bool ConfigureNamesBool[] =
false, false,
NULL, NULL, NULL NULL, NULL, NULL
}, },
{
{"track_wal_io_timing", PGC_SUSET, STATS_CUMULATIVE,
gettext_noop("Collects timing statistics for WAL I/O activity."),
NULL
},
&track_wal_io_timing,
false,
NULL, NULL, NULL
},
{ {
{"update_process_title", PGC_SUSET, PROCESS_TITLE, {"update_process_title", PGC_SUSET, PROCESS_TITLE,

1
src/backend/utils/misc/postgresql.conf.sample
View File

@ -641,7 +641,6 @@
#track_counts = on #track_counts = on
#track_cost_delay_timing = off #track_cost_delay_timing = off
#track_io_timing = off #track_io_timing = off
#track_wal_io_timing = off
#track_functions = none # none, pl, all #track_functions = none # none, pl, all
#stats_fetch_consistency = cache # cache, none, snapshot #stats_fetch_consistency = cache # cache, none, snapshot

1
src/include/access/xlog.h
View File

@ -54,7 +54,6 @@ extern PGDLLIMPORT char *wal_consistency_checking_string;
extern PGDLLIMPORT bool log_checkpoints; extern PGDLLIMPORT bool log_checkpoints;
extern PGDLLIMPORT int CommitDelay; extern PGDLLIMPORT int CommitDelay;
extern PGDLLIMPORT int CommitSiblings; extern PGDLLIMPORT int CommitSiblings;
extern PGDLLIMPORT bool track_wal_io_timing;
extern PGDLLIMPORT int wal_decode_buffer_size; extern PGDLLIMPORT int wal_decode_buffer_size;
extern PGDLLIMPORT int CheckPointSegments; extern PGDLLIMPORT int CheckPointSegments;

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

@ -57,6 +57,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 202502212 #define CATALOG_VERSION_NO 202502241
#endif #endif

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

@ -5950,9 +5950,9 @@
{ oid => '1136', descr => 'statistics: information about WAL activity', { oid => '1136', descr => 'statistics: information about WAL activity',
proname => 'pg_stat_get_wal', proisstrict => 'f', provolatile => 's', proname => 'pg_stat_get_wal', proisstrict => 'f', provolatile => 's',
proparallel => 'r', prorettype => 'record', proargtypes => '', proparallel => 'r', prorettype => 'record', proargtypes => '',
proallargtypes => '{int8,int8,numeric,int8,int8,int8,float8,float8,timestamptz}', proallargtypes => '{int8,int8,numeric,int8,timestamptz}',
proargmodes => '{o,o,o,o,o,o,o,o,o}', proargmodes => '{o,o,o,o,o}',
proargnames => '{wal_records,wal_fpi,wal_bytes,wal_buffers_full,wal_write,wal_sync,wal_write_time,wal_sync_time,stats_reset}', proargnames => '{wal_records,wal_fpi,wal_bytes,wal_buffers_full,stats_reset}',
prosrc => 'pg_stat_get_wal' }, prosrc => 'pg_stat_get_wal' },
{ oid => '6248', descr => 'statistics: information about WAL prefetching', { oid => '6248', descr => 'statistics: information about WAL prefetching',
proname => 'pg_stat_get_recovery_prefetch', prorows => '1', proretset => 't', proname => 'pg_stat_get_recovery_prefetch', prorows => '1', proretset => 't',

32
src/include/pgstat.h
View File

@ -212,7 +212,7 @@ typedef struct PgStat_TableXactStatus
* ------------------------------------------------------------ * ------------------------------------------------------------
*/ */
#define PGSTAT_FILE_FORMAT_ID 0x01A5BCB3 #define PGSTAT_FILE_FORMAT_ID 0x01A5BCB4
typedef struct PgStat_ArchiverStats typedef struct PgStat_ArchiverStats
{ {
@ -480,28 +480,9 @@ typedef struct PgStat_WalStats
PgStat_Counter wal_fpi; PgStat_Counter wal_fpi;
uint64 wal_bytes; uint64 wal_bytes;
PgStat_Counter wal_buffers_full; PgStat_Counter wal_buffers_full;
PgStat_Counter wal_write;
PgStat_Counter wal_sync;
PgStat_Counter wal_write_time;
PgStat_Counter wal_sync_time;
TimestampTz stat_reset_timestamp; TimestampTz stat_reset_timestamp;
} PgStat_WalStats; } PgStat_WalStats;
/*
* This struct stores wal-related durations as instr_time, which makes it
* cheaper and easier to accumulate them, by not requiring type
* conversions. During stats flush instr_time will be converted into
* microseconds.
*/
typedef struct PgStat_PendingWalStats
{
PgStat_Counter wal_write;
PgStat_Counter wal_sync;
instr_time wal_write_time;
instr_time wal_sync_time;
} PgStat_PendingWalStats;
/* /*
* Functions in pgstat.c * Functions in pgstat.c
*/ */
@ -583,7 +564,7 @@ extern bool pgstat_bktype_io_stats_valid(PgStat_BktypeIO *backend_io,
BackendType bktype); BackendType bktype);
extern void pgstat_count_io_op(IOObject io_object, IOContext io_context, extern void pgstat_count_io_op(IOObject io_object, IOContext io_context,
IOOp io_op, uint32 cnt, uint64 bytes); IOOp io_op, uint32 cnt, uint64 bytes);
extern instr_time pgstat_prepare_io_time(bool track_io_guc); extern instr_time pgstat_prepare_io_time(void);
extern void pgstat_count_io_op_time(IOObject io_object, IOContext io_context, extern void pgstat_count_io_op_time(IOObject io_object, IOContext io_context,
IOOp io_op, instr_time start_time, IOOp io_op, instr_time start_time,
uint32 cnt, uint64 bytes); uint32 cnt, uint64 bytes);
@ -834,13 +815,4 @@ extern PGDLLIMPORT PgStat_Counter pgStatTransactionIdleTime;
/* updated by the traffic cop and in errfinish() */ /* updated by the traffic cop and in errfinish() */
extern PGDLLIMPORT SessionEndType pgStatSessionEndCause; extern PGDLLIMPORT SessionEndType pgStatSessionEndCause;
/*
* Variables in pgstat_wal.c
*/
/* updated directly by backends and background processes */
extern PGDLLIMPORT PgStat_PendingWalStats PendingWalStats;
#endif /* PGSTAT_H */ #endif /* PGSTAT_H */

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

@ -2259,12 +2259,8 @@ pg_stat_wal| SELECT wal_records,
wal_fpi, wal_fpi,
wal_bytes, wal_bytes,
wal_buffers_full, wal_buffers_full,
wal_write,
wal_sync,
wal_write_time,
wal_sync_time,
stats_reset stats_reset
FROM pg_stat_get_wal() w(wal_records, wal_fpi, wal_bytes, wal_buffers_full, wal_write, wal_sync, wal_write_time, wal_sync_time, stats_reset); FROM pg_stat_get_wal() w(wal_records, wal_fpi, wal_bytes, wal_buffers_full, stats_reset);
pg_stat_wal_receiver| SELECT pid, pg_stat_wal_receiver| SELECT pid,
status, status,
receive_start_lsn, receive_start_lsn,

1
src/tools/pgindent/typedefs.list
View File

@ -2173,7 +2173,6 @@ PgStat_KindInfo
PgStat_LocalState PgStat_LocalState
PgStat_PendingDroppedStatsItem PgStat_PendingDroppedStatsItem
PgStat_PendingIO PgStat_PendingIO
PgStat_PendingWalStats
PgStat_SLRUStats PgStat_SLRUStats
PgStat_ShmemControl PgStat_ShmemControl
PgStat_Snapshot PgStat_Snapshot