Commite1b13cc

authored and

committed

Exit correctly from PrepareRedoRemove() when not found

Complex crash bug all started with this failure.Diagnosed and fixed by Nikhil Sontakke, reviewed by me.Reported-by: Jeff JanesAuthor: Nikhil SontakkeDiscussion:https://postgr.es/m/CAMkU=1xBP8cqdS5eK8APHL=X6RHMMM2vG5g+QamduuTsyCwv9g@mail.gmail.com

1 parentbfc79ee commite1b13ccCopy full SHA for e1b13cc

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2633,6 +2633,7 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)`
`2633`	`2633`	`{`
`2634`	`2634`	`GlobalTransactiongxact=NULL;`
`2635`	`2635`	`inti;`
	`2636`	`+boolfound= false;`
`2636`	`2637`
`2637`	`2638`	`Assert(LWLockHeldByMeInMode(TwoPhaseStateLock,LW_EXCLUSIVE));`
`2638`	`2639`	`Assert(RecoveryInProgress());`
`@@ -2644,14 +2645,15 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)`
`2644`	`2645`	`if (gxact->xid==xid)`
`2645`	`2646`	`{`
`2646`	`2647`	`Assert(gxact->inredo);`
	`2648`	`+found= true;`
`2647`	`2649`	`break;`
`2648`	`2650`	`}`
`2649`	`2651`	`}`
`2650`	`2652`
`2651`	`2653`	`/*`
`2652`	`2654`	`* Just leave if there is nothing, this is expected during WAL replay.`
`2653`	`2655`	`*/`
`2654`		`-if (gxact==NULL)`
	`2656`	`+if (!found)`
`2655`	`2657`	`return;`
`2656`	`2658`
`2657`	`2659`	`/*`

Comments

(0)