database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-06 19:59:18 +03:00
Code

Check RecoveryInProgress() while holding ProcArrayLock during snapshots.

Browse Source 
This prevents a rare, yet possible race condition at the exact moment
of transition from recovery to normal running.
This commit is contained in:
Simon Riggs 2010-04-19 18:03:38 +00:00
parent 39bf46384b
commit 7bc76d51fb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/storage/ipc/procarray.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.63 2010/04/18 18:05:55 sriggs Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.64 2010/04/19 18:03:38 sriggs Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1074,8 +1074,6 @@ GetSnapshotData(Snapshot snapshot)
errmsg("out of memory"))); errmsg("out of memory")));
} }
snapshot->takenDuringRecovery = RecoveryInProgress();
/* /*
* It is sufficient to get shared lock on ProcArrayLock, even if we are * It is sufficient to get shared lock on ProcArrayLock, even if we are
* going to set MyProc->xmin. * going to set MyProc->xmin.
@ -1091,8 +1089,15 @@ GetSnapshotData(Snapshot snapshot)
globalxmin = xmin = xmax; globalxmin = xmin = xmax;
/* /*
* If in recovery get any known assigned xids. * If we're in recovery then snapshot data comes from a different place,
* so decide which route we take before grab the lock. It is possible
* for recovery to end before we finish taking snapshot, and for newly
* assigned transaction ids to be added to the procarray. Xmax cannot
* change while we hold ProcArrayLock, so those newly added transaction
* ids would be filtered away, so we need not be concerned about them.
*/ */
snapshot->takenDuringRecovery = RecoveryInProgress();
if (!snapshot->takenDuringRecovery) if (!snapshot->takenDuringRecovery)
{ {
/* /*