Commit80845b7

committed

Don't clobber postmaster sigmask in dsm_impl_resize.

Commit4518c79 intended to block signals in regular backends thatallocate DSM segments, but dsm_impl_resize() is also reached bydsm_postmaster_startup(). It's not OK to clobber the postmaster'ssignal mask, so only manipulate the signal mask when under thepostmaster.Back-patch to all releases, like4518c79.Discussion:https://postgr.es/m/CA%2BhUKGKNpK%3D2OMeea_AZwpLg7Bm4%3DgYWk7eDjZ5F6YbozfOf8w%40mail.gmail.com

1 parent7c0eb3c commit80845b7Copy full SHA for 80845b7

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,8 @@ dsm_impl_posix_resize(int fd, off_t size)`
`362`	`362`	`* allowed SIGUSR1 to interrupt us repeatedly (for example, due to recovery`
`363`	`363`	`* conflicts), the retry loop might never succeed.`
`364`	`364`	`*/`
`365`		`-PG_SETMASK(&BlockSig);`
	`365`	`+if (IsUnderPostmaster)`
	`366`	`+PG_SETMASK(&BlockSig);`
`366`	`367`
`367`	`368`	`pgstat_report_wait_start(WAIT_EVENT_DSM_ALLOCATE);`
`368`	`369`	`#if defined(HAVE_POSIX_FALLOCATE)&& defined(__linux__)`
`@@ -398,9 +399,12 @@ dsm_impl_posix_resize(int fd, off_t size)`
`398`	`399`	`#endif`
`399`	`400`	`pgstat_report_wait_end();`
`400`	`401`
`401`		`-save_errno=errno;`
`402`		`-PG_SETMASK(&UnBlockSig);`
`403`		`-errno=save_errno;`
	`402`	`+if (IsUnderPostmaster)`
	`403`	`+{`
	`404`	`+save_errno=errno;`
	`405`	`+PG_SETMASK(&UnBlockSig);`
	`406`	`+errno=save_errno;`
	`407`	`+}`
`404`	`408`
`405`	`409`	`returnrc;`
`406`	`410`	`}`

Comments

(0)