Cleanup VirtualXact at end of Hot Standby

simonat2ndQuadrant · simonat2ndQuadrant · commit edfc84b878d6 · 2012-11-29T22:17:15.000Z
Resolves bug 7572 reported by Daniele Varrazzo
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
@@ -103,6 +103,9 @@ ShutdownRecoveryTransactionEnvironment(void)
 
 	/* Release all locks the tracked transactions were holding */
 	StandbyReleaseAllLocks();
+
+	/* Cleanup our VirtualTransaction */
+	VirtualXactLockTableCleanup();
 }
 
 
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
@@ -209,7 +209,6 @@ static bool FastPathUnGrantRelationLock(Oid relid, LOCKMODE lockmode);
 static bool FastPathTransferRelationLocks(LockMethod lockMethodTable,
 							  const LOCKTAG *locktag, uint32 hashcode);
 static PROCLOCK *FastPathGetRelationLockEntry(LOCALLOCK *locallock);
-static void VirtualXactLockTableCleanup(void);
 
 /*
  * To make the fast-path lock mechanism work, we must have some way of
@@ -3734,7 +3733,7 @@ VirtualXactLockTableInsert(VirtualTransactionId vxid)
  *		Check whether a VXID lock has been materialized; if so, release it,
  *		unblocking waiters.
  */
-static void
+void
 VirtualXactLockTableCleanup()
 {
 	bool		fastpath;
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
@@ -544,6 +544,7 @@ extern void DumpAllLocks(void);
 
 /* Lock a VXID (used to wait for a transaction to finish) */
 extern void VirtualXactLockTableInsert(VirtualTransactionId vxid);
+extern void VirtualXactLockTableCleanup(void);
 extern bool VirtualXactLock(VirtualTransactionId vxid, bool wait);
 
 #endif   /* LOCK_H */

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,9 @@ ShutdownRecoveryTransactionEnvironment(void)`
`103`	`103`
`104`	`104`	`/* Release all locks the tracked transactions were holding */`
`105`	`105`	`StandbyReleaseAllLocks();`
	`106`	`+`
	`107`	`+ /* Cleanup our VirtualTransaction */`
	`108`	`+ VirtualXactLockTableCleanup();`
`106`	`109`	`}`
`107`	`110`
`108`	`111`