diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:48:06 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:48:06 +0100 |
| commit | 9e23d05b256adb0964f13464f9be5ae6e856cd19 (patch) | |
| tree | 250eb33cb491c32ed81e3e5c48f32abc08ad05e6 | |
| parent | a9b7bf82fab90cd7005d7f89fd374ce51319e971 (diff) | |
| download | postgresql-9e23d05b256adb0964f13464f9be5ae6e856cd19.tar.gz postgresql-9e23d05b256adb0964f13464f9be5ae6e856cd19.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.
Backpatch to all versions 9.0+
Analysis and report by Marco Nenciarini
Bug fix by Simon Riggs
| -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 6645732f74c..634c0313c94 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -4307,7 +4307,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, rnode); + } /* If we have a full-page image, restore it and we're done */ if (record->xl_info & XLR_BKP_BLOCK(0)) |