From 2e5e856f6b4f4e7445ec4b14fc4504469f6f4f54 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 17 Sep 2006 22:16:22 +0000
Subject: [PATCH] Marginal cleanup in arrangements for ensuring
 StrategyHintVacuum is cleared after an error during VACUUM.  We have a PG_TRY
 block anyway around the only call sites, so just reset it in the CATCH clause
 instead of having AtEOXact_Buffers blindly do it during xact end.  I think
 the old code was actively wrong for the case of a failure during ANALYZE
 inside a subtransaction --- the flag wouldn't get cleared until main
 transaction end. Probably not worth back-patching though.

---
 src/backend/commands/vacuum.c       | 6 +++---
 src/backend/storage/buffer/bufmgr.c | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 8c1df23d9b..4ba48d34df 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.338 2006/08/18 16:09:08 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.339 2006/09/17 22:16:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -460,6 +460,8 @@ vacuum(VacuumStmt *vacstmt, List *relids)
 	{
 		/* Make sure cost accounting is turned off after error */
 		VacuumCostActive = false;
+		/* And reset buffer replacement strategy, too */
+		StrategyHintVacuum(false);
 		PG_RE_THROW();
 	}
 	PG_END_TRY();
@@ -1173,8 +1175,6 @@ vacuum_rel(Oid relid, VacuumStmt *vacstmt, char expected_relkind)
 	 * Now release the session-level lock on the master table.
 	 */
 	UnlockRelationIdForSession(&onerelid, lmode);
-
-	return;
 }
 
 
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index fd68bb91e7..147b2ef8d8 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.209 2006/07/23 03:07:58 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/storage/buffer/bufmgr.c,v 1.210 2006/09/17 22:16:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1171,9 +1171,6 @@ AtEOXact_Buffers(bool isCommit)
 #endif
 
 	AtEOXact_LocalBuffers(isCommit);
-
-	/* Make sure we reset the strategy hint in case VACUUM errored out */
-	StrategyHintVacuum(false);
 }
 
 /*