aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Riggs <simon@2ndQuadrant.com>2015-06-27 00:44:56 +0100
committerSimon Riggs <simon@2ndQuadrant.com>2015-06-27 00:44:56 +0100
commit9af67b667cca10b3f458548c90a75e4e45ced2b3 (patch)
tree976b9bac14fc15e1f24a99e75f5c1a2d601c1f85
parentb6c4b58ac52aa9046c45bd8c2c9fc8925087c8d3 (diff)
downloadpostgresql-9af67b667cca10b3f458548c90a75e4e45ced2b3.tar.gz
postgresql-9af67b667cca10b3f458548c90a75e4e45ced2b3.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.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 2e3b9d2c2b7..7ce48ea191f 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -7517,7 +7517,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))