From: Alvaro Herrera Date: Wed, 23 Jul 2008 20:21:04 +0000 (+0000) Subject: Ratchet up patch to improve autovacuum wraparound messages. X-Git-Tag: REL8_3_4~28 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55817fb1ed155eb7fbfbedab09a4c9bed2411435;p=postgresql Ratchet up patch to improve autovacuum wraparound messages. Simon Riggs --- diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 36653f83d3..8f45d1d0c8 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -55,7 +55,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.71.2.5 2008/07/21 15:27:08 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.71.2.6 2008/07/23 20:21:04 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -2655,15 +2655,14 @@ autovac_report_activity(VacuumStmt *vacstmt, Oid relid, bool for_wraparound) char *relname = get_rel_name(relid); char *nspname = get_namespace_name(get_rel_namespace(relid)); -#define MAX_AUTOVAC_ACTIV_LEN (NAMEDATALEN * 2 + 32) +#define MAX_AUTOVAC_ACTIV_LEN (NAMEDATALEN * 2 + 56) char activity[MAX_AUTOVAC_ACTIV_LEN]; /* Report the command and possible options */ if (vacstmt->vacuum) snprintf(activity, MAX_AUTOVAC_ACTIV_LEN, - "autovacuum: VACUUM%s%s", - vacstmt->analyze ? " ANALYZE" : "", - for_wraparound ? " (to prevent wraparound)" : ""); + "autovacuum: VACUUM%s", + vacstmt->analyze ? " ANALYZE" : ""); else snprintf(activity, MAX_AUTOVAC_ACTIV_LEN, "autovacuum: ANALYZE"); @@ -2680,7 +2679,8 @@ autovac_report_activity(VacuumStmt *vacstmt, Oid relid, bool for_wraparound) int len = strlen(activity); snprintf(activity + len, MAX_AUTOVAC_ACTIV_LEN - len, - " %s.%s", nspname, relname); + " %s.%s%s", nspname, relname, + for_wraparound ? " (to prevent wraparound)" : ""); } /* Set statement_timestamp() to current time for pg_stat_activity */