Permalink
Browse files

Fix inappropriately-timed memory context switch in autovacuum_do_vac_…

…analyze.

This accidentally failed to fail before 8.3, because the context we were
switching back to was long-lived anyway; but it sure looks risky as can be
now.  Well spotted by Pavan Deolasee.
  • Loading branch information...
1 parent e5ecea0 commit 2059a5a1bce6932c52a440b62154e70a0fad5d2b @tglsfdc tglsfdc committed Mar 14, 2008
Showing with 12 additions and 10 deletions.
  1. +12 −10 src/backend/postmaster/autovacuum.c
@@ -55,7 +55,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.71.2.2 2008/03/14 17:26:01 alvherre Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.71.2.3 2008/03/14 23:49:33 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2602,17 +2602,12 @@ autovacuum_do_vac_analyze(Oid relid, bool dovacuum, bool doanalyze,
BufferAccessStrategy bstrategy)
{
VacuumStmt vacstmt;
+ List *relids;
MemoryContext old_cxt;
+ /* Set up command parameters --- use a local variable instead of palloc */
MemSet(&vacstmt, 0, sizeof(vacstmt));
- /*
- * The list must survive transaction boundaries, so make sure we create it
- * in a long-lived context
- */
- old_cxt = MemoryContextSwitchTo(AutovacMemCxt);
-
- /* Set up command parameters */
vacstmt.type = T_VacuumStmt;
vacstmt.vacuum = dovacuum;
vacstmt.full = false;
@@ -2622,11 +2617,18 @@ autovacuum_do_vac_analyze(Oid relid, bool dovacuum, bool doanalyze,
vacstmt.relation = NULL; /* not used since we pass a relids list */
vacstmt.va_cols = NIL;
+ /*
+ * The list must survive transaction boundaries, so make sure we create it
+ * in a long-lived context
+ */
+ old_cxt = MemoryContextSwitchTo(AutovacMemCxt);
+ relids = list_make1_oid(relid);
+ MemoryContextSwitchTo(old_cxt);
+
/* Let pgstat know what we're doing */
autovac_report_activity(&vacstmt, relid);
- vacuum(&vacstmt, list_make1_oid(relid), bstrategy, for_wraparound, true);
- MemoryContextSwitchTo(old_cxt);
+ vacuum(&vacstmt, relids, bstrategy, for_wraparound, true);
}
/*

0 comments on commit 2059a5a

Please sign in to comment.