diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index 120bac8875fd..a3bc9785335f 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -1014,8 +1014,11 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
see . However, if the autovacuum
is running to prevent transaction ID wraparound (i.e., the autovacuum query
name in the pg_stat_activity view ends with
- (to prevent wraparound)), the autovacuum is not
- automatically interrupted.
+ (to prevent wraparound) or the
+ autovacuum_wraparound value in the
+ triggered_by column in the
+ pg_stat_progress_vacuum view), the autovacuum is
+ not automatically interrupted.
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 2741c1385932..199d87d51cf0 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -6687,6 +6687,73 @@ FROM pg_stat_get_backend_idset() AS backendid;
stale.
+
+
+
+ mode text
+
+
+ The mode of the current vacuum operation. Possible values are:
+
+
+
+ normal: A standard vacuum operation that is not
+ required to be aggressive and has not entered failsafe mode.
+
+
+
+
+ aggressive: A vacuum that must scan the entire
+ table because or
+ (or the corresponding
+ per-table storage parameters) required it, or because page skipping
+ was disabled via VACUUM (DISABLE_PAGE_SKIPPING).
+
+
+
+
+ failsafe: A vacuum operation that entered failsafe
+ mode when the system was at risk of transaction ID or multixact ID
+ wraparound (see and
+ ).
+
+
+
+
+
+
+
+
+ triggered_by text
+
+
+ The trigger of the current vacuum operation. Possible values are:
+
+
+
+ manual: Initiated by an explicit
+ VACUUM command.
+
+
+
+
+ autovacuum: Launched by autovacuum based on
+ or
+ .
+
+
+
+
+ autovacuum_wraparound: Launched by autovacuum to
+ avoid transaction ID or multixact ID wraparound (see
+ as well as
+ and
+ ).
+
+
+
+
+
diff --git a/src/backend/access/heap/vacuumlazy.c b/src/backend/access/heap/vacuumlazy.c
index deb9a3dc0d1a..48700b873178 100644
--- a/src/backend/access/heap/vacuumlazy.c
+++ b/src/backend/access/heap/vacuumlazy.c
@@ -664,6 +664,16 @@ heap_vacuum_rel(Relation rel, const VacuumParams params,
pgstat_progress_start_command(PROGRESS_COMMAND_VACUUM,
RelationGetRelid(rel));
+ pgstat_progress_update_param(PROGRESS_VACUUM_MODE,
+ PROGRESS_VACUUM_MODE_NORMAL);
+ if (AmAutoVacuumWorkerProcess())
+ pgstat_progress_update_param(PROGRESS_VACUUM_TRIGGERED_BY,
+ params.is_wraparound
+ ? PROGRESS_VACUUM_TRIGGERED_BY_AUTOVACUUM_WRAPAROUND
+ : PROGRESS_VACUUM_TRIGGERED_BY_AUTOVACUUM);
+ else
+ pgstat_progress_update_param(PROGRESS_VACUUM_TRIGGERED_BY,
+ PROGRESS_VACUUM_TRIGGERED_BY_MANUAL);
/*
* Setup error traceback support for ereport() first. The idea is to set
@@ -787,6 +797,9 @@ heap_vacuum_rel(Relation rel, const VacuumParams params,
* to increase the number of dead tuples it can prune away.)
*/
vacrel->aggressive = vacuum_get_cutoffs(rel, params, &vacrel->cutoffs);
+ if (vacrel->aggressive)
+ pgstat_progress_update_param(PROGRESS_VACUUM_MODE,
+ PROGRESS_VACUUM_MODE_AGGRESSIVE);
vacrel->rel_pages = orig_rel_pages = RelationGetNumberOfBlocks(rel);
vacrel->vistest = GlobalVisTestFor(rel);
@@ -808,6 +821,8 @@ heap_vacuum_rel(Relation rel, const VacuumParams params,
* visibility map (even those set all-frozen)
*/
vacrel->aggressive = true;
+ pgstat_progress_update_param(PROGRESS_VACUUM_MODE,
+ PROGRESS_VACUUM_MODE_AGGRESSIVE);
skipwithvm = false;
}
@@ -2996,9 +3011,10 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
{
const int progress_index[] = {
PROGRESS_VACUUM_INDEXES_TOTAL,
- PROGRESS_VACUUM_INDEXES_PROCESSED
+ PROGRESS_VACUUM_INDEXES_PROCESSED,
+ PROGRESS_VACUUM_MODE
};
- int64 progress_val[2] = {0, 0};
+ int64 progress_val[3] = {0, 0, PROGRESS_VACUUM_MODE_FAILSAFE};
VacuumFailsafeActive = true;
@@ -3014,8 +3030,8 @@ lazy_check_wraparound_failsafe(LVRelState *vacrel)
vacrel->do_index_cleanup = false;
vacrel->do_rel_truncate = false;
- /* Reset the progress counters */
- pgstat_progress_update_multi_param(2, progress_index, progress_val);
+ /* Reset the progress counters and the mode */
+ pgstat_progress_update_multi_param(3, progress_index, progress_val);
ereport(WARNING,
(errmsg("bypassing nonessential maintenance of table \"%s.%s.%s\" as a failsafe after %d index scans",
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index 059e8778ca7c..6abd7f46067c 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -1265,7 +1265,15 @@ CREATE VIEW pg_stat_progress_vacuum AS
S.param6 AS max_dead_tuple_bytes, S.param7 AS dead_tuple_bytes,
S.param8 AS num_dead_item_ids, S.param9 AS indexes_total,
S.param10 AS indexes_processed,
- S.param11 / 1000000::double precision AS delay_time
+ S.param11 / 1000000::double precision AS delay_time,
+ CASE S.param12 WHEN 1 THEN 'normal'
+ WHEN 2 THEN 'aggressive'
+ WHEN 3 THEN 'failsafe'
+ ELSE NULL END AS mode,
+ CASE S.param13 WHEN 1 THEN 'manual'
+ WHEN 2 THEN 'autovacuum'
+ WHEN 3 THEN 'autovacuum_wraparound'
+ ELSE NULL END AS triggered_by
FROM pg_stat_get_progress_info('VACUUM') AS S
LEFT JOIN pg_database D ON S.datid = D.oid;
diff --git a/src/include/commands/progress.h b/src/include/commands/progress.h
index 1cde4bd9bcf1..5fc5d3fcbee1 100644
--- a/src/include/commands/progress.h
+++ b/src/include/commands/progress.h
@@ -29,6 +29,8 @@
#define PROGRESS_VACUUM_INDEXES_TOTAL 8
#define PROGRESS_VACUUM_INDEXES_PROCESSED 9
#define PROGRESS_VACUUM_DELAY_TIME 10
+#define PROGRESS_VACUUM_MODE 11
+#define PROGRESS_VACUUM_TRIGGERED_BY 12
/* Phases of vacuum (as advertised via PROGRESS_VACUUM_PHASE) */
#define PROGRESS_VACUUM_PHASE_SCAN_HEAP 1
@@ -38,6 +40,16 @@
#define PROGRESS_VACUUM_PHASE_TRUNCATE 5
#define PROGRESS_VACUUM_PHASE_FINAL_CLEANUP 6
+/* Modes of vacuum (as advertised via PROGRESS_VACUUM_MODE) */
+#define PROGRESS_VACUUM_MODE_NORMAL 1
+#define PROGRESS_VACUUM_MODE_AGGRESSIVE 2
+#define PROGRESS_VACUUM_MODE_FAILSAFE 3
+
+/* Reasons for vacuum (as advertised via PROGRESS_VACUUM_TRIGGERED_BY) */
+#define PROGRESS_VACUUM_TRIGGERED_BY_MANUAL 1
+#define PROGRESS_VACUUM_TRIGGERED_BY_AUTOVACUUM 2
+#define PROGRESS_VACUUM_TRIGGERED_BY_AUTOVACUUM_WRAPAROUND 3
+
/* Progress parameters for analyze */
#define PROGRESS_ANALYZE_PHASE 0
#define PROGRESS_ANALYZE_BLOCKS_TOTAL 1
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index 7c52181cbcb3..f09854265a59 100644
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -2104,7 +2104,19 @@ pg_stat_progress_vacuum| SELECT s.pid,
s.param8 AS num_dead_item_ids,
s.param9 AS indexes_total,
s.param10 AS indexes_processed,
- ((s.param11)::double precision / (1000000)::double precision) AS delay_time
+ ((s.param11)::double precision / (1000000)::double precision) AS delay_time,
+ CASE s.param12
+ WHEN 1 THEN 'normal'::text
+ WHEN 2 THEN 'aggressive'::text
+ WHEN 3 THEN 'failsafe'::text
+ ELSE NULL::text
+ END AS mode,
+ CASE s.param13
+ WHEN 1 THEN 'manual'::text
+ WHEN 2 THEN 'autovacuum'::text
+ WHEN 3 THEN 'autovacuum_wraparound'::text
+ ELSE NULL::text
+ END AS triggered_by
FROM (pg_stat_get_progress_info('VACUUM'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20)
LEFT JOIN pg_database d ON ((s.datid = d.oid)));
pg_stat_recovery_prefetch| SELECT stats_reset,