Commita715c20

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 parentc4a617e commita715c20Copy full SHA for a715c20

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`	`/* Truncate (or extend) the file to the requested size. */`
`368`	`369`	`do`
`@@ -402,9 +403,12 @@ dsm_impl_posix_resize(int fd, off_t size)`
`402`	`403`	`}`
`403`	`404`	`#endif/* HAVE_POSIX_FALLOCATE && __linux__ */`
`404`	`405`
`405`		`-save_errno=errno;`
`406`		`-PG_SETMASK(&UnBlockSig);`
`407`		`-errno=save_errno;`
	`406`	`+if (IsUnderPostmaster)`
	`407`	`+{`
	`408`	`+save_errno=errno;`
	`409`	`+PG_SETMASK(&UnBlockSig);`
	`410`	`+errno=save_errno;`
	`411`	`+}`
`408`	`412`
`409`	`413`	`returnrc;`
`410`	`414`	`}`

Comments

(0)