diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:46:58 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:46:58 +0100 |
| commit | 892a0e4e4559fc200d4803db24f4babca37fe76d (patch) | |
| tree | 08df91c1218c547138fb4d0240eab7fe21fbabb6 /src/backend/access/heap/heapam.c | |
| parent | d66b67fe21e11d8f1c7ac7d8445f8468fbc9222f (diff) | |
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
Diffstat (limited to 'src/backend/access/heap/heapam.c')
| -rw-r--r-- | src/backend/access/heap/heapam.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 9918c226c28..b068483c58e 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7064,7 +7064,13 @@ heap_xlog_freeze_page(XLogRecPtr lsn, XLogRecord *record) * consider the frozen xids as running. */ 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 (record->xl_info & XLR_BKP_BLOCK(0)) |