From 5b382029eb8330bf9daef50093bb483d8e48e6c2 Mon Sep 17 00:00:00 2001 From: Bertrand Drouvot Date: Fri, 6 Dec 2024 07:39:19 +0000 Subject: [PATCH v9 2/2] Report the amount of time we slept before exiting parallel workers or we might get incomplete data due to WORKER_REPORT_DELAY_INTERVAL --- src/backend/commands/vacuum.c | 6 +----- src/backend/commands/vacuumparallel.c | 7 +++++++ src/include/commands/vacuum.h | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) 90.3% src/backend/commands/ 9.6% src/include/commands/ diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index 6f9e515f56..7ad42a9507 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -64,10 +64,6 @@ * Minimum amount of time (in ms) between two reports of the delayed time from a * parallel worker to the leader. The goal is to avoid the leader to be * interrupted too frequently while it might be sleeping for cost delay. - * - * Note that unsent delayed_time will disappear when the parallel workers exit - * because they are not considered in parallel_vacuum_end(). That's an acceptable - * error for the use cases. */ #define WORKER_REPORT_DELAY_INTERVAL 1000 @@ -121,7 +117,7 @@ int VacuumCostBalanceLocal = 0; static instr_time last_report_time; /* total nap time between two reports */ -static double nap_time_since_last_report = 0; +double nap_time_since_last_report = 0; /* non-export function prototypes */ static List *expand_vacuum_rel(VacuumRelation *vrel, diff --git a/src/backend/commands/vacuumparallel.c b/src/backend/commands/vacuumparallel.c index 67cba17a56..a09b655a13 100644 --- a/src/backend/commands/vacuumparallel.c +++ b/src/backend/commands/vacuumparallel.c @@ -1087,6 +1087,13 @@ parallel_vacuum_main(dsm_segment *seg, shm_toc *toc) InstrEndParallelQuery(&buffer_usage[ParallelWorkerNumber], &wal_usage[ParallelWorkerNumber]); + /* + * Report the amount of time we slept (or we might get incomplete data due + * to WORKER_REPORT_DELAY_INTERVAL). + */ + pgstat_progress_parallel_incr_param(PROGRESS_VACUUM_TIME_DELAYED, + nap_time_since_last_report); + TidStoreDetach(dead_items); /* Pop the error context stack */ diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h index 759f9a87d3..7a3ff07ec0 100644 --- a/src/include/commands/vacuum.h +++ b/src/include/commands/vacuum.h @@ -312,6 +312,7 @@ extern PGDLLIMPORT int VacuumCostBalanceLocal; extern PGDLLIMPORT bool VacuumFailsafeActive; extern PGDLLIMPORT double vacuum_cost_delay; extern PGDLLIMPORT int vacuum_cost_limit; +extern PGDLLIMPORT double nap_time_since_last_report; /* in commands/vacuum.c */ extern void ExecVacuum(ParseState *pstate, VacuumStmt *vacstmt, bool isTopLevel); -- 2.34.1