Change wording of logged message when cancelling an autovacuum task, using

alvherre · alvherre · commit 59c841506c5b · 2007-12-06T14:32:54.000Z
american speling (unlike this commit message).  Per complaint from Mike C. on
bug #3790 and subsequent discussion.
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.538 2007/11/15 21:14:38 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.539 2007/12/06 14:32:54 alvherre Exp $
  *
  * NOTES
  *	  this is the "main" module of the postgres backend and
@@ -2578,6 +2578,10 @@ ProcessInterrupts(void)
 			ereport(ERROR,
 					(errcode(ERRCODE_QUERY_CANCELED),
 					 errmsg("canceling statement due to statement timeout")));
+		else if (IsAutoVacuumWorkerProcess())
+			ereport(ERROR,
+					(errcode(ERRCODE_QUERY_CANCELED),
+					 errmsg("canceling autovacuum task")));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_QUERY_CANCELED),

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.538 2007/11/15 21:14:38 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.539 2007/12/06 14:32:54 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2578,6 +2578,10 @@ ProcessInterrupts(void)`
`2578`	`2578`	`ereport(ERROR,`
`2579`	`2579`	`(errcode(ERRCODE_QUERY_CANCELED),`
`2580`	`2580`	`errmsg("canceling statement due to statement timeout")));`
	`2581`	`+ else if (IsAutoVacuumWorkerProcess())`
	`2582`	`+ ereport(ERROR,`
	`2583`	`+ (errcode(ERRCODE_QUERY_CANCELED),`
	`2584`	`+ errmsg("canceling autovacuum task")));`
`2581`	`2585`	`else`
`2582`	`2586`	`ereport(ERROR,`
`2583`	`2587`	`(errcode(ERRCODE_QUERY_CANCELED),`