diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:41:47 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2015-06-27 00:41:47 +0100 |
| commit | 66fbcb0d2e1b201477dd2977b6eb93b1cfd9dd6c (patch) | |
| tree | d815f513e33b487cac25fabda02d1fdf0867006f /src | |
| parent | 7d60b2af34842ae89b1abdd31fb5d303bd43c514 (diff) | |
| download | postgresql-66fbcb0d2e1b201477dd2977b6eb93b1cfd9dd6c.tar.gz postgresql-66fbcb0d2e1b201477dd2977b6eb93b1cfd9dd6c.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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/heap/heapam.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c index 208457584d9..86a2e6bae6a 100644 --- a/src/backend/access/heap/heapam.c +++ b/src/backend/access/heap/heapam.c @@ -7572,9 +7572,12 @@ heap_xlog_freeze_page(XLogReaderState *record) if (InHotStandby) { RelFileNode rnode; + TransactionId latestRemovedXid = cutoff_xid; + + TransactionIdRetreat(latestRemovedXid); XLogRecGetBlockTag(record, 0, &rnode, NULL, NULL); - ResolveRecoveryConflictWithSnapshot(cutoff_xid, rnode); + ResolveRecoveryConflictWithSnapshot(latestRemovedXid, rnode); } if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO) |