1
0
mirror of https://github.com/postgres/postgres.git synced 2025-07-21 16:02:15 +03:00

Avoid hot standby cancels from VAC FREEZE

VACUUM FREEZE generated false cancelations of standby queries on an
otherwise idle master. Caused by an off-by-one error on cutoff_xid
which goes back to original commit.

Backpatch to all versions 9.0+

Analysis and report by Marco Nenciarini

Bug fix by Simon Riggs
This commit is contained in:
Simon Riggs
2015-06-27 00:44:56 +01:00
parent b6c4b58ac5
commit 9af67b667c

View File

@ -7517,7 +7517,13 @@ heap_xlog_freeze_page(XLogRecPtr lsn, XLogRecord *record)
* consider the frozen xids as running. * consider the frozen xids as running.
*/ */
if (InHotStandby) if (InHotStandby)
ResolveRecoveryConflictWithSnapshot(cutoff_xid, xlrec->node); {
TransactionId latestRemovedXid = cutoff_xid;
TransactionIdRetreat(latestRemovedXid);
ResolveRecoveryConflictWithSnapshot(latestRemovedXid, rnode);
}
/* If we have a full-page image, restore it and we're done */ /* If we have a full-page image, restore it and we're done */
if (record->xl_info & XLR_BKP_BLOCK(0)) if (record->xl_info & XLR_BKP_BLOCK(0))