NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6537a48

committed

Avoid hot standby cancels from VAC FREEZE

VACUUM FREEZE generated false cancelations of standby queries on anotherwise idle master. Caused by an off-by-one error on cutoff_xidwhich goes back to original commit.Analysis and report by Marco NenciariniBug fix by Simon RiggsThis is a correct backpatch of commit66fbcb0 to branches 9.1 through9.4. That commit was backpatched to 9.0 originally, but it wasimmediately reverted in 9.0-9.4 because it didn't compile.

1 parent4632076 commit6537a48Copy full SHA for 6537a48

File tree

1 file changed

+14

-2

lines changed

src/backend/access/heap
- heapam.c

1 file changed

+14

-2

lines changed

`‎src/backend/access/heap/heapam.c`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6928,7 +6928,13 @@ heap_xlog_freeze(XLogRecPtr lsn, XLogRecord *record)`
`6928`	`6928`	`* consider the frozen xids as running.`
`6929`	`6929`	`*/`
`6930`	`6930`	`if (InHotStandby)`
`6931`		`-ResolveRecoveryConflictWithSnapshot(cutoff_xid,xlrec->node);`
	`6931`	`+{`
	`6932`	`+TransactionIdlatestRemovedXid=cutoff_xid;`
	`6933`	`+`
	`6934`	`+TransactionIdRetreat(latestRemovedXid);`
	`6935`	`+`
	`6936`	`+ResolveRecoveryConflictWithSnapshot(latestRemovedXid,xlrec->node);`
	`6937`	`+}`
`6932`	`6938`
`6933`	`6939`	`/* If we have a full-page image, restore it and we're done */`
`6934`	`6940`	`if (record->xl_info&XLR_BKP_BLOCK(0))`
`@@ -7103,7 +7109,13 @@ heap_xlog_freeze_page(XLogRecPtr lsn, XLogRecord *record)`
`7103`	`7109`	`* consider the frozen xids as running.`
`7104`	`7110`	`*/`
`7105`	`7111`	`if (InHotStandby)`
`7106`		`-ResolveRecoveryConflictWithSnapshot(cutoff_xid,xlrec->node);`
	`7112`	`+{`
	`7113`	`+TransactionIdlatestRemovedXid=cutoff_xid;`
	`7114`	`+`
	`7115`	`+TransactionIdRetreat(latestRemovedXid);`
	`7116`	`+`
	`7117`	`+ResolveRecoveryConflictWithSnapshot(latestRemovedXid,xlrec->node);`
	`7118`	`+}`
`7107`	`7119`
`7108`	`7120`	`/* If we have a full-page image, restore it and we're done */`
`7109`	`7121`	`if (record->xl_info&XLR_BKP_BLOCK(0))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6537a48

File tree

1 file changed

1 file changed

`‎src/backend/access/heap/heapam.c`

0 commit comments