NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita25c2b7

committed

Accept pg_upgraded tuples during multixact freezing

The new MultiXact freezing routines introduced by commit8e9a16aneglected to consider tuples that came from a pg_upgrade'd database; avacuum run that tried to freeze such tuples would die with an error suchasERROR: MultiXactId 11415437 does no longer exist -- apparent wraparoundTo fix, ensure that GetMultiXactIdMembers is allowed to return emptymultis when the infomask bits are right, as is done in other callsites.Per trouble report from F-Secure.In passing, fix a copy&paste bug reported by Andrey Karpov from VIVA64from their PVS-Studio static checked, that instead of setting relminmxidto Invalid, we were setting relfrozenxid twice. Not an importantmistake because that code branch is about relations for which we don'tuse the frozenxid/minmxid values at all in the first place, but seems towarrants a fix nonetheless.

1 parent28fff0e commita25c2b7Copy full SHA for a25c2b7

File tree

2 files changed

-3

lines changed

src/backend
- access/heap
  - heapam.c
- catalog
  - heap.c

2 files changed

-3

lines changed

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

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5288,6 +5288,7 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,`
`5288`	`5288`	`boolhas_lockers;`
`5289`	`5289`	`TransactionIdupdate_xid;`
`5290`	`5290`	`boolupdate_committed;`
	`5291`	`+boolallow_old;`
`5291`	`5292`
`5292`	`5293`	`*flags=0;`
`5293`	`5294`
`@@ -5349,7 +5350,9 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,`
`5349`	`5350`	`* anything.`
`5350`	`5351`	`*/`
`5351`	`5352`
`5352`		`-nmembers=GetMultiXactIdMembers(multi,&members, false);`
	`5353`	`+allow_old= !(t_infomask&HEAP_LOCK_MASK)&&`
	`5354`	`+HEAP_XMAX_IS_LOCKED_ONLY(t_infomask);`
	`5355`	`+nmembers=GetMultiXactIdMembers(multi,&members,allow_old);`
`5353`	`5356`	`if (nmembers <=0)`
`5354`	`5357`	`{`
`5355`	`5358`	`/* Nothing worth keeping */`
`@@ -6060,10 +6063,13 @@ heap_tuple_needs_freeze(HeapTupleHeader tuple, TransactionId cutoff_xid,`
`6060`	`6063`	`MultiXactMember*members;`
`6061`	`6064`	`intnmembers;`
`6062`	`6065`	`inti;`
	`6066`	`+boolallow_old;`
`6063`	`6067`
`6064`	`6068`	`/* need to check whether any member of the mxact is too old */`
`6065`	`6069`
`6066`		`-nmembers=GetMultiXactIdMembers(multi,&members, false);`
	`6070`	`+allow_old= !(tuple->t_infomask&HEAP_LOCK_MASK)&&`
	`6071`	`+HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask);`
	`6072`	`+nmembers=GetMultiXactIdMembers(multi,&members,allow_old);`
`6067`	`6073`
`6068`	`6074`	`for (i=0;i<nmembers;i++)`
`6069`	`6075`	`{`

`‎src/backend/catalog/heap.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -903,7 +903,7 @@ AddNewRelationTuple(Relation pg_class_desc,`
`903`	`903`	`* commands/sequence.c.)`
`904`	`904`	`*/`
`905`	`905`	`new_rel_reltup->relfrozenxid=InvalidTransactionId;`
`906`		`-new_rel_reltup->relfrozenxid=InvalidMultiXactId;`
	`906`	`+new_rel_reltup->relminmxid=InvalidMultiXactId;`
`907`	`907`	`}`
`908`	`908`
`909`	`909`	`new_rel_reltup->relowner=relowner;`

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!

Commita25c2b7

File tree

2 files changed

2 files changed

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

`‎src/backend/catalog/heap.c`

0 commit comments