Report wait event for cost-based vacuum delay.

Author: Justin Pryzby
Discussion: https://postgr.es/m/20200321040750[email protected]

diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index fd3b6b9f38c417c23a4df946bf8ba932c979ba8d..e87fb9634e572294d8e2df1e10752a76f30c5946 100644 (file)
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -1515,6 +1515,8 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
           (<filename>pg_wal</filename>, archive or stream) before trying
           again to retrieve WAL data, at recovery.
          </entry>
+         <entry><literal>VacuumDelay</literal></entry>
+         <entry>Waiting in a cost-based vacuum delay point.</entry>
         </row>
         <row>
          <entry morerows="68"><literal>IO</literal></entry>

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index d625d17bf46dd0bb1a46c5d2717a0a45c32d64ed..59731d687f6a76d23daae13407476526b9678ceb 100644 (file)
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -2019,7 +2019,9 @@ vacuum_delay_point(void)
        if (msec > VacuumCostDelay * 4)
            msec = VacuumCostDelay * 4;
 
+       pgstat_report_wait_start(WAIT_EVENT_VACUUM_DELAY);
        pg_usleep((long) (msec * 1000));
+       pgstat_report_wait_end();
 
        VacuumCostBalance = 0;
 

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 5a8c4abe8a2345e33cf4ca830f3f5f20b4f7f6e8..4763c24be944753ded9e2d656a06221b663456da 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -3830,6 +3830,9 @@ pgstat_get_wait_timeout(WaitEventTimeout w)
        case WAIT_EVENT_RECOVERY_RETRIEVE_RETRY_INTERVAL:
            event_name = "RecoveryRetrieveRetryInterval";
            break;
+       case WAIT_EVENT_VACUUM_DELAY:
+           event_name = "VacuumDelay";
+           break;
            /* no default case, so that compiler will warn */
    }
 

diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 5d3b4786577a883c5eccab7f653ef91ffd1dd19d..a07012bf4bac39dd5b0d09608bb3fcaf2da2e7b5 100644 (file)
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -850,7 +850,8 @@ typedef enum
    WAIT_EVENT_BASE_BACKUP_THROTTLE = PG_WAIT_TIMEOUT,
    WAIT_EVENT_PG_SLEEP,
    WAIT_EVENT_RECOVERY_APPLY_DELAY,
-   WAIT_EVENT_RECOVERY_RETRIEVE_RETRY_INTERVAL
+   WAIT_EVENT_RECOVERY_RETRIEVE_RETRY_INTERVAL,
+   WAIT_EVENT_VACUUM_DELAY
 } WaitEventTimeout;
 
 /* ----------