Commit17aa39d

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 parente73fe6e commit17aa39dCopy full SHA for 17aa39d

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

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

Comments

(0)