NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitdbe4876

committed

Extract catalog info for error reporting before an error actually happens.

Also, remove redundant reset of for-wraparound PGPROC flag.Thanks to Tom Lane for noticing both bogosities.

1 parentfcc20bd commitdbe4876Copy full SHA for dbe4876

File tree

1 file changed

+18

-15

lines changed

src/backend/postmaster
- autovacuum.c

1 file changed

+18

-15

lines changed

`‎src/backend/postmaster/autovacuum.c`

Lines changed: 18 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`*`
`56`	`56`	`*`
`57`	`57`	`* IDENTIFICATION`
`58`		`- * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.63 2007/10/24 20:55:36 alvherre Exp $`
	`58`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.64 2007/10/25 14:45:55 alvherre Exp $`
`59`	`59`	`*`
`60`	`60`	`*-------------------------------------------------------------------------`
`61`	`61`	`*/`
`@@ -1994,6 +1994,9 @@ do_autovacuum(void)`
`1994`	`1994`	`autovac_table*tab;`
`1995`	`1995`	`WorkerInfoworker;`
`1996`	`1996`	`boolskipit;`
	`1997`	`+char*datname,`
	`1998`	`+*nspname,`
	`1999`	`+*relname;`
`1997`	`2000`
`1998`	`2001`	`CHECK_FOR_INTERRUPTS();`
`1999`	`2002`
`@@ -2094,6 +2097,17 @@ do_autovacuum(void)`
`2094`	`2097`	`LWLockRelease(ProcArrayLock);`
`2095`	`2098`	`}`
`2096`	`2099`
	`2100`	`+/*`
	`2101`	`+ * Save the relation name for a possible error message, to avoid a`
	`2102`	`+ * catalog lookup in case of an error. We do it in`
	`2103`	`+ * TopTransactionContext so that they go away automatically in the next`
	`2104`	`+ * iteration.`
	`2105`	`+ */`
	`2106`	`+MemoryContextSwitchTo(TopTransactionContext);`
	`2107`	`+datname=get_database_name(MyDatabaseId);`
	`2108`	`+nspname=get_namespace_name(get_rel_namespace(tab->at_relid));`
	`2109`	`+relname=get_rel_name(tab->at_relid);`
	`2110`	`+`
`2097`	`2111`	`/*`
`2098`	`2112`	`* We will abort vacuuming the current table if something errors out,`
`2099`	`2113`	`* and continue with the next one in schedule; in particular, this`
`@@ -2102,7 +2116,6 @@ do_autovacuum(void)`
`2102`	`2116`	`PG_TRY();`
`2103`	`2117`	`{`
`2104`	`2118`	`/* have at it */`
`2105`		`-MemoryContextSwitchTo(TopTransactionContext);`
`2106`	`2119`	`autovacuum_do_vac_analyze(tab->at_relid,`
`2107`	`2120`	`tab->at_dovacuum,`
`2108`	`2121`	`tab->at_doanalyze,`
`@@ -2118,14 +2131,10 @@ do_autovacuum(void)`
`2118`	`2131`	`HOLD_INTERRUPTS();`
`2119`	`2132`	`if (tab->at_dovacuum)`
`2120`	`2133`	`errcontext("automatic vacuum of table \"%s.%s.%s\"",`
`2121`		`-get_database_name(MyDatabaseId),`
`2122`		`-get_namespace_name(get_rel_namespace(tab->at_relid)),`
`2123`		`-get_rel_name(tab->at_relid));`
	`2134`	`+datname,nspname,relname);`
`2124`	`2135`	`else`
`2125`	`2136`	`errcontext("automatic analyze of table \"%s.%s.%s\"",`
`2126`		`-get_database_name(MyDatabaseId),`
`2127`		`-get_namespace_name(get_rel_namespace(tab->at_relid)),`
`2128`		`-get_rel_name(tab->at_relid));`
	`2137`	`+datname,nspname,relname);`
`2129`	`2138`	`EmitErrorReport();`
`2130`	`2139`
`2131`	`2140`	`/* this resets the PGPROC flags too */`
`@@ -2139,13 +2148,7 @@ do_autovacuum(void)`
`2139`	`2148`	`}`
`2140`	`2149`	`PG_END_TRY();`
`2141`	`2150`
`2142`		`-/* reset my PGPROC flag */`
`2143`		`-if (tab->at_wraparound)`
`2144`		`-{`
`2145`		`-LWLockAcquire(ProcArrayLock,LW_EXCLUSIVE);`
`2146`		`-MyProc->vacuumFlags &= ~PROC_VACUUM_FOR_WRAPAROUND;`
`2147`		`-LWLockRelease(ProcArrayLock);`
`2148`		`-}`
	`2151`	`+/* the PGPROC flags are reset at the next end of transaction */`
`2149`	`2152`
`2150`	`2153`	`/* be tidy */`
`2151`	`2154`	`pfree(tab);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitdbe4876

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/autovacuum.c`

0 commit comments