Ratchet up patch to improve autovacuum wraparound messages.

Simon Riggs
This commit is contained in:
Alvaro Herrera 2008-07-23 20:21:04 +00:00
parent 8f9a868b70
commit 55817fb1ed

View File

@ -55,7 +55,7 @@
* *
* *
* IDENTIFICATION * 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 *relname = get_rel_name(relid);
char *nspname = get_namespace_name(get_rel_namespace(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]; char activity[MAX_AUTOVAC_ACTIV_LEN];
/* Report the command and possible options */ /* Report the command and possible options */
if (vacstmt->vacuum) if (vacstmt->vacuum)
snprintf(activity, MAX_AUTOVAC_ACTIV_LEN, snprintf(activity, MAX_AUTOVAC_ACTIV_LEN,
"autovacuum: VACUUM%s%s", "autovacuum: VACUUM%s",
vacstmt->analyze ? " ANALYZE" : "", vacstmt->analyze ? " ANALYZE" : "");
for_wraparound ? " (to prevent wraparound)" : "");
else else
snprintf(activity, MAX_AUTOVAC_ACTIV_LEN, snprintf(activity, MAX_AUTOVAC_ACTIV_LEN,
"autovacuum: ANALYZE"); "autovacuum: ANALYZE");
@ -2680,7 +2679,8 @@ autovac_report_activity(VacuumStmt *vacstmt, Oid relid, bool for_wraparound)
int len = strlen(activity); int len = strlen(activity);
snprintf(activity + len, MAX_AUTOVAC_ACTIV_LEN - len, 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 */ /* Set statement_timestamp() to current time for pg_stat_activity */