diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-02-13 01:32:20 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-02-13 01:32:20 +0000 |
| commit | b95a720a487b5027af1b9e4a12542800598ff5de (patch) | |
| tree | d49548ca497e8169d9cbae7f7127f4f73330f0a5 /src/include/storage/standby.h | |
| parent | fafa374f2d1e04ab265d56cdadb634124364646f (diff) | |
| download | postgresql-b95a720a487b5027af1b9e4a12542800598ff5de.tar.gz | |
Re-enable max_standby_delay = -1 using deadlock detection on startup
process. If startup waits on a buffer pin we send a request to all
backends to cancel themselves if they are holding the buffer pin
required and they are also waiting on a lock. If not, startup waits
until max_standby_delay before cancelling any backend waiting for
the requested buffer pin.
Diffstat (limited to 'src/include/storage/standby.h')
| -rw-r--r-- | src/include/storage/standby.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index 2a0b56ff0b..081fa51ba0 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.7 2010/01/31 19:01:11 sriggs Exp $ + * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.8 2010/02/13 01:32:20 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "access/xlog.h" #include "storage/lock.h" +#include "storage/procsignal.h" #include "storage/relfilenode.h" extern int vacuum_defer_cleanup_age; @@ -30,7 +31,7 @@ extern void ResolveRecoveryConflictWithTablespace(Oid tsid); extern void ResolveRecoveryConflictWithDatabase(Oid dbid); extern void ResolveRecoveryConflictWithBufferPin(void); -extern void SendRecoveryConflictWithBufferPin(void); +extern void SendRecoveryConflictWithBufferPin(ProcSignalReason reason); extern void CheckRecoveryConflictDeadlock(LWLockId partitionLock); /* |