database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

pgstat: set timestamps of fixed-numbered stats after a crash.

Browse Source 
When not loading stats at startup (i.e. pgstat_discard_stats() getting
called), reset timestamps of fixed numbered stats would be left at
0. Oversight in 5891c7a8ed8.

Instead use pgstat_reset_after_failure() and add tests verifying that
fixed-numbered reset timestamps are set appropriately.

Reported-By: "David G. Johnston" <david.g.johnston@gmail.com>
Discussion: https://postgr.es/m/CAKFQuwamFuaQHKdhcMt4Gbw5+Hca2UE741B8gOOXoA=TtAd2Yw@mail.gmail.com
This commit is contained in:
Andres Freund 2022-04-14 17:40:25 -07:00
parent 3f19e176ae
commit 5cd1c40b3c
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/utils/activity/pgstat.c
View File

@ -166,7 +166,7 @@ typedef struct PgStat_SnapshotEntry
static void pgstat_write_statsfile(void); static void pgstat_write_statsfile(void);
static void pgstat_read_statsfile(void); static void pgstat_read_statsfile(void);
static void pgstat_reset_after_failure(TimestampTz ts); static void pgstat_reset_after_failure(void);
static bool pgstat_flush_pending_entries(bool nowait); static bool pgstat_flush_pending_entries(bool nowait);
@ -427,6 +427,12 @@ pgstat_discard_stats(void)
errmsg("unlinked permanent statistics file \"%s\"", errmsg("unlinked permanent statistics file \"%s\"",
PGSTAT_STAT_PERMANENT_FILENAME))); PGSTAT_STAT_PERMANENT_FILENAME)));
} }
/*
* Reset stats contents. This will set reset timestamps of fixed-numbered
* stats to the current time (no variable stats exist).
*/
pgstat_reset_after_failure();
} }
/* /*
@ -1422,7 +1428,6 @@ pgstat_read_statsfile(void)
bool found; bool found;
const char *statfile = PGSTAT_STAT_PERMANENT_FILENAME; const char *statfile = PGSTAT_STAT_PERMANENT_FILENAME;
PgStat_ShmemControl *shmem = pgStatLocal.shmem; PgStat_ShmemControl *shmem = pgStatLocal.shmem;
TimestampTz ts = GetCurrentTimestamp();
/* shouldn't be called from postmaster */ /* shouldn't be called from postmaster */
Assert(IsUnderPostmaster || !IsPostmasterEnvironment); Assert(IsUnderPostmaster || !IsPostmasterEnvironment);
@ -1445,7 +1450,7 @@ pgstat_read_statsfile(void)
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open statistics file \"%s\": %m", errmsg("could not open statistics file \"%s\": %m",
statfile))); statfile)));
pgstat_reset_after_failure(ts); pgstat_reset_after_failure();
return; return;
} }
@ -1597,19 +1602,20 @@ error:
ereport(LOG, ereport(LOG,
(errmsg("corrupted statistics file \"%s\"", statfile))); (errmsg("corrupted statistics file \"%s\"", statfile)));
/* Set the current timestamp as reset timestamp */ pgstat_reset_after_failure();
pgstat_reset_after_failure(ts);
goto done; goto done;
} }
/* /*
* Helper to reset / drop stats after restoring stats from disk failed, * Helper to reset / drop stats after a crash or after restoring stats from
* potentially after already loading parts. * disk failed, potentially after already loading parts.
*/ */
static void static void
pgstat_reset_after_failure(TimestampTz ts) pgstat_reset_after_failure(void)
{ {
TimestampTz ts = GetCurrentTimestamp();
/* reset fixed-numbered stats */ /* reset fixed-numbered stats */
for (int kind = PGSTAT_KIND_FIRST_VALID; kind <= PGSTAT_KIND_LAST; kind++) for (int kind = PGSTAT_KIND_FIRST_VALID; kind <= PGSTAT_KIND_LAST; kind++)
{ {

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

@ -250,6 +250,16 @@ cmp_ok(
$wal_restart2->{reset}, $wal_restart2->{reset},
"$sect: newer stats_reset"); "$sect: newer stats_reset");
$node->stop('immediate');
$node->start;
$sect = "post immediate restart";
my $wal_restart_immediate = wal_stats();
cmp_ok(
$wal_reset_restart->{reset}, 'lt',
$wal_restart_immediate->{reset},
"$sect: reset timestamp is new");
$node->stop; $node->stop;
done_testing(); done_testing();