diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-31 19:01:11 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-31 19:01:11 +0000 |
| commit | c85c941470efc44494fd7a5f426ee85fc65c268c (patch) | |
| tree | 0f75f2e13b828e152a42cd0447f29096756e3aa0 /src/include | |
| parent | 034fffbf31be42c789f4a5fbe2edb62e4b07fa9c (diff) | |
| download | postgresql-c85c941470efc44494fd7a5f426ee85fc65c268c.tar.gz postgresql-c85c941470efc44494fd7a5f426ee85fc65c268c.zip | |
Detect early deadlock in Hot Standby when Startup is already waiting. First
stage of required deadlock detection to allow re-enabling max_standby_delay
setting of -1, which is now essential in the absence of improved relation-
specific conflict resoluton. Requested by Greg Stark et al.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/storage/standby.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index b8bdb26b9bd..2a0b56ff0b7 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.6 2010/01/29 17:10:05 sriggs Exp $ + * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.7 2010/01/31 19:01:11 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -31,6 +31,7 @@ extern void ResolveRecoveryConflictWithDatabase(Oid dbid); extern void ResolveRecoveryConflictWithBufferPin(void); extern void SendRecoveryConflictWithBufferPin(void); +extern void CheckRecoveryConflictDeadlock(LWLockId partitionLock); /* * Standby Rmgr (RM_STANDBY_ID) |