diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-05-25 19:39:49 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2016-05-25 19:39:49 -0400 |
| commit | de887cc8afd2f7a7761108bfe001c3d451811b7a (patch) | |
| tree | eecaca2c48f4184ae4985c4a68f8c6018f1e1781 | |
| parent | 5551dac59c0601b49d57a3f897fb0a6d581e58ac (diff) | |
| download | postgresql-de887cc8afd2f7a7761108bfe001c3d451811b7a.tar.gz postgresql-de887cc8afd2f7a7761108bfe001c3d451811b7a.zip | |
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.
Analysis and report by Marco Nenciarini
Bug fix by Simon Riggs
This is a correct backpatch of commit 66fbcb0d2e to branches 9.1 through
9.4. That commit was backpatched to 9.0 originally, but it was
immediately reverted in 9.0-9.4 because it didn't compile.
| -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 4f52f05c290..cca8c35fd10 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -4317,7 +4317,13 @@ heap_xlog_freeze(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, xlrec->node); + } /* If we have a full-page image, restore it and we're done */ if (record->xl_info & XLR_BKP_BLOCK(0)) |