Commita05f40e

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 parentff78bf7 commita05f40eCopy full SHA for a05f40e

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,8 @@ dsm_impl_posix_resize(int fd, off_t size)`
`352`	`352`	`* allowed SIGUSR1 to interrupt us repeatedly (for example, due to recovery`
`353`	`353`	`* conflicts), the retry loop might never succeed.`
`354`	`354`	`*/`
`355`		`-PG_SETMASK(&BlockSig);`
	`355`	`+if (IsUnderPostmaster)`
	`356`	`+PG_SETMASK(&BlockSig);`
`356`	`357`
`357`	`358`	`/* Truncate (or extend) the file to the requested size. */`
`358`	`359`	`do`
`@@ -390,9 +391,12 @@ dsm_impl_posix_resize(int fd, off_t size)`
`390`	`391`	`}`
`391`	`392`	`#endif/* HAVE_POSIX_FALLOCATE && __linux__ */`
`392`	`393`
`393`		`-save_errno=errno;`
`394`		`-PG_SETMASK(&UnBlockSig);`
`395`		`-errno=save_errno;`
	`394`	`+if (IsUnderPostmaster)`
	`395`	`+{`
	`396`	`+save_errno=errno;`
	`397`	`+PG_SETMASK(&UnBlockSig);`
	`398`	`+errno=save_errno;`
	`399`	`+}`
`396`	`400`
`397`	`401`	`returnrc;`
`398`	`402`	`}`

Comments

(0)