diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/activity/pgstat_checkpointer.c | 21 | ||||
| -rw-r--r-- | src/backend/utils/adt/pgstatfuncs.c | 35 |
2 files changed, 29 insertions, 27 deletions
diff --git a/src/backend/utils/activity/pgstat_checkpointer.c b/src/backend/utils/activity/pgstat_checkpointer.c index 03ed5dddda7..301a0bc7bd3 100644 --- a/src/backend/utils/activity/pgstat_checkpointer.c +++ b/src/backend/utils/activity/pgstat_checkpointer.c @@ -47,11 +47,11 @@ pgstat_report_checkpointer(void) pgstat_begin_changecount_write(&stats_shmem->changecount); #define CHECKPOINTER_ACC(fld) stats_shmem->stats.fld += PendingCheckpointerStats.fld - CHECKPOINTER_ACC(timed_checkpoints); - CHECKPOINTER_ACC(requested_checkpoints); - CHECKPOINTER_ACC(checkpoint_write_time); - CHECKPOINTER_ACC(checkpoint_sync_time); - CHECKPOINTER_ACC(buf_written_checkpoints); + CHECKPOINTER_ACC(num_timed); + CHECKPOINTER_ACC(num_requested); + CHECKPOINTER_ACC(write_time); + CHECKPOINTER_ACC(sync_time); + CHECKPOINTER_ACC(buffers_written); #undef CHECKPOINTER_ACC pgstat_end_changecount_write(&stats_shmem->changecount); @@ -92,6 +92,7 @@ pgstat_checkpointer_reset_all_cb(TimestampTz ts) &stats_shmem->stats, sizeof(stats_shmem->stats), &stats_shmem->changecount); + stats_shmem->stats.stat_reset_timestamp = ts; LWLockRelease(&stats_shmem->lock); } @@ -113,10 +114,10 @@ pgstat_checkpointer_snapshot_cb(void) /* compensate by reset offsets */ #define CHECKPOINTER_COMP(fld) pgStatLocal.snapshot.checkpointer.fld -= reset.fld; - CHECKPOINTER_COMP(timed_checkpoints); - CHECKPOINTER_COMP(requested_checkpoints); - CHECKPOINTER_COMP(checkpoint_write_time); - CHECKPOINTER_COMP(checkpoint_sync_time); - CHECKPOINTER_COMP(buf_written_checkpoints); + CHECKPOINTER_COMP(num_timed); + CHECKPOINTER_COMP(num_requested); + CHECKPOINTER_COMP(write_time); + CHECKPOINTER_COMP(sync_time); + CHECKPOINTER_COMP(buffers_written); #undef CHECKPOINTER_COMP } diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c index 998c69e241c..28ee97968b8 100644 --- a/src/backend/utils/adt/pgstatfuncs.c +++ b/src/backend/utils/adt/pgstatfuncs.c @@ -1182,21 +1182,21 @@ PG_STAT_GET_DBENTRY_FLOAT8_MS(idle_in_transaction_time) PG_STAT_GET_DBENTRY_FLOAT8_MS(session_time) 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 -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 -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 @@ -1212,19 +1212,25 @@ pg_stat_get_bgwriter_maxwritten_clean(PG_FUNCTION_ARGS) } 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 */ PG_RETURN_FLOAT8((double) - pgstat_fetch_stat_checkpointer()->checkpoint_write_time); + pgstat_fetch_stat_checkpointer()->write_time); } 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 */ 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 @@ -1684,14 +1690,9 @@ pg_stat_reset_shared(PG_FUNCTION_ARGS) if (strcmp(target, "archiver") == 0) pgstat_reset_of_kind(PGSTAT_KIND_ARCHIVER); 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); + else if (strcmp(target, "checkpointer") == 0) pgstat_reset_of_kind(PGSTAT_KIND_CHECKPOINTER); - } else if (strcmp(target, "io") == 0) pgstat_reset_of_kind(PGSTAT_KIND_IO); else if (strcmp(target, "recovery_prefetch") == 0) @@ -1702,7 +1703,7 @@ pg_stat_reset_shared(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), 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(); } |