database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Remove cut-off bug from RunningTransactionData

Browse Source 
32ac7a118fc17f5 tried to fix a Hot Standby issue
reported by Greg Stark, but in doing so caused
a different bug to appear, noted by Andres Freund.

Revoke the core changes from 32ac7a118fc17f5,
leaving in its place a minor change in code
ordering and comments to explain for the future.
This commit is contained in:
Simon Riggs 2018-06-14 12:02:41 +01:00
parent 91781335ed
commit 802bde87ba
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1907,7 +1907,7 @@ ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc)
* GetRunningTransactionData -- returns information about running transactions. * GetRunningTransactionData -- returns information about running transactions.
* *
* Similar to GetSnapshotData but returns more information. We include * Similar to GetSnapshotData but returns more information. We include
* all PGXACTs with an assigned TransactionId, but not VACUUM processes. * all PGXACTs with an assigned TransactionId, even VACUUM processes.
* *
* We acquire XidGenLock and ProcArrayLock, but the caller is responsible for * We acquire XidGenLock and ProcArrayLock, but the caller is responsible for
* releasing them. Acquiring XidGenLock ensures that no new XIDs enter the proc * releasing them. Acquiring XidGenLock ensures that no new XIDs enter the proc
@ -1995,10 +1995,6 @@ GetRunningTransactionData(void)
volatile PGXACT *pgxact = &allPgXact[pgprocno]; volatile PGXACT *pgxact = &allPgXact[pgprocno];
TransactionId xid; TransactionId xid;
/* Ignore procs running LAZY VACUUM */
if (pgxact->vacuumFlags & PROC_IN_VACUUM)
continue;
/* Fetch xid just once - see GetNewTransactionId */ /* Fetch xid just once - see GetNewTransactionId */
xid = pgxact->xid; xid = pgxact->xid;
@ -2009,13 +2005,26 @@ GetRunningTransactionData(void)
if (!TransactionIdIsValid(xid)) if (!TransactionIdIsValid(xid))
continue; continue;
xids[count++] = xid; /*
* Be careful not to exclude any xids before calculating the values of
* oldestRunningXid and suboverflowed, since these are used to clean
* up transaction information held on standbys.
*/
if (TransactionIdPrecedes(xid, oldestRunningXid)) if (TransactionIdPrecedes(xid, oldestRunningXid))
oldestRunningXid = xid; oldestRunningXid = xid;
if (pgxact->overflowed) if (pgxact->overflowed)
suboverflowed = true; suboverflowed = true;
/*
* If we wished to exclude xids this would be the right place for it.
* Procs with the PROC_IN_VACUUM flag set don't usually assign xids,
* but they do during truncation at the end when they get the lock
* and truncate, so it is not much of a problem to include them if they
* are seen and it is cleaner to include them.
*/
xids[count++] = xid;
} }
/* /*