diff options
| author | Thomas Munro <tmunro@postgresql.org> | 2022-07-15 01:23:29 +1200 |
|---|---|---|
| committer | Thomas Munro <tmunro@postgresql.org> | 2022-07-15 02:00:35 +1200 |
| commit | a715c20043c1396bc28f19514e667bfb081e8ad2 (patch) | |
| tree | cf3b413f98113b0c9681275c932858a0d608528c | |
| parent | c4a617ea117e9ca1e79c20d4d8430e0784cc9139 (diff) | |
| download | postgresql-a715c20043c1396bc28f19514e667bfb081e8ad2.tar.gz postgresql-a715c20043c1396bc28f19514e667bfb081e8ad2.zip | |
Don't clobber postmaster sigmask in dsm_impl_resize.
Commit 4518c798 intended to block signals in regular backends that
allocate DSM segments, but dsm_impl_resize() is also reached by
dsm_postmaster_startup(). It's not OK to clobber the postmaster's
signal mask, so only manipulate the signal mask when under the
postmaster.
Back-patch to all releases, like 4518c798.
Discussion: https://postgr.es/m/CA%2BhUKGKNpK%3D2OMeea_AZwpLg7Bm4%3DgYWk7eDjZ5F6YbozfOf8w%40mail.gmail.com
| -rw-r--r-- | src/backend/storage/ipc/dsm_impl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c index 33a27b3a452..44962af32cd 100644 --- a/src/backend/storage/ipc/dsm_impl.c +++ b/src/backend/storage/ipc/dsm_impl.c @@ -362,7 +362,8 @@ dsm_impl_posix_resize(int fd, off_t size) * allowed SIGUSR1 to interrupt us repeatedly (for example, due to recovery * conflicts), the retry loop might never succeed. */ - PG_SETMASK(&BlockSig); + if (IsUnderPostmaster) + PG_SETMASK(&BlockSig); /* Truncate (or extend) the file to the requested size. */ do @@ -402,9 +403,12 @@ dsm_impl_posix_resize(int fd, off_t size) } #endif /* HAVE_POSIX_FALLOCATE && __linux__ */ - save_errno = errno; - PG_SETMASK(&UnBlockSig); - errno = save_errno; + if (IsUnderPostmaster) + { + save_errno = errno; + PG_SETMASK(&UnBlockSig); + errno = save_errno; + } return rc; } |