diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-16 10:05:59 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-16 10:05:59 +0000 |
| commit | a8ce974cddef3957b0615d743a1d090d12e81d50 (patch) | |
| tree | 1a7b80c1def4f5719a2d9a223b47e639dcbcb504 /src/backend/access/transam/xact.c | |
| parent | c9dc53be77664952ebd3b50a1e920e92306484de (diff) | |
| download | postgresql-a8ce974cddef3957b0615d743a1d090d12e81d50.tar.gz postgresql-a8ce974cddef3957b0615d743a1d090d12e81d50.zip | |
Teach standby conflict resolution to use SIGUSR1
Conflict reason is passed through directly to the backend, so we can
take decisions about the effect of the conflict based upon the local
state. No specific changes, as yet, though this prepares for later work.
CancelVirtualTransaction() sends signals while holding ProcArrayLock.
Introduce errdetail_abort() to give message detail explaining that the
abort was caused by conflict processing. Remove CONFLICT_MODE states
in favour of using PROCSIG_RECOVERY_CONFLICT states directly, for clarity.
Diffstat (limited to 'src/backend/access/transam/xact.c')
| -rw-r--r-- | src/backend/access/transam/xact.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 5ecd3c5725b..1a89d78ba95 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.280 2010/01/09 16:49:27 sriggs Exp $ + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.281 2010/01/16 10:05:50 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -313,8 +313,7 @@ IsTransactionState(void) /* * IsAbortedTransactionBlockState * - * This returns true if we are currently running a query - * within an aborted transaction block. + * This returns true if we are within an aborted transaction block. */ bool IsAbortedTransactionBlockState(void) |