NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8d498a5

committed

Fix bogus coding in WaitForBackgroundWorkerShutdown().

Some conditions resulted in "return" directly out of a PG_TRY block,which left the exception stack dangling, and to add insult to injuryfailed to restore the state of set_latch_on_sigusr1.This is a bug only in 9.5; in HEAD it was accidentally fixed by commitdb0f6ca, which removed the surrounding PG_TRY block. However, I (tgl)chose to apply the patch to HEAD as well, because the old coding wasgratuitously different from WaitForBackgroundWorkerStartup(), and therewould indeed have been no bug if it were done like that to start with.Dmitry IvanovDiscussion: <1637882.WfYN5gPf1A@abook>

1 parent81568a9 commit8d498a5Copy full SHA for 8d498a5

File tree

1 file changed

-2

lines changed

src/backend/postmaster
- bgworker.c

1 file changed

-2

lines changed

`‎src/backend/postmaster/bgworker.c`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1005,13 +1005,16 @@ WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *handle)`
`1005`	`1005`
`1006`	`1006`	`status=GetBackgroundWorkerPid(handle,&pid);`
`1007`	`1007`	`if (status==BGWH_STOPPED)`
`1008`		`-returnstatus;`
	`1008`	`+break;`
`1009`	`1009`
`1010`	`1010`	`rc=WaitLatch(&MyProc->procLatch,`
`1011`	`1011`	`WL_LATCH_SET \|WL_POSTMASTER_DEATH,0);`
`1012`	`1012`
`1013`	`1013`	`if (rc&WL_POSTMASTER_DEATH)`
`1014`		`-returnBGWH_POSTMASTER_DIED;`
	`1014`	`+{`
	`1015`	`+status=BGWH_POSTMASTER_DIED;`
	`1016`	`+break;`
	`1017`	`+}`
`1015`	`1018`
`1016`	`1019`	`ResetLatch(&MyProc->procLatch);`
`1017`	`1020`	`}`

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!

Commit8d498a5

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/bgworker.c`

0 commit comments