reshke commented on issue #1566: URL: https://github.com/apache/cloudberry/issues/1566#issuecomment-3904465497
https://github.com/postgres/postgres/commit/2019e6ecfa2 conflicts: ``` reshke@yezzey-cbdb-bench:~/cloudberry$ git diff src/backend/storage/ipc/dsm_impl.c diff --cc src/backend/storage/ipc/dsm_impl.c index 46a60e1b898,10c392c3f03..00000000000 --- a/src/backend/storage/ipc/dsm_impl.c +++ b/src/backend/storage/ipc/dsm_impl.c @@@ -63,8 -62,8 +63,9 @@@ #endif #include "common/file_perm.h" + #include "libpq/pqsignal.h" /* for PG_SETMASK macro */ #include "miscadmin.h" +#include "libpq/pqsignal.h" /* for PG_SETMASK macro */ #include "pgstat.h" #include "portability/mem.h" #include "postmaster/postmaster.h" @@@ -356,7 -355,6 +357,10 @@@ dsm_impl_posix_resize(int fd, off_t siz { int rc; int save_errno; ++<<<<<<< HEAD + sigset_t save_sigmask; ++======= ++>>>>>>> 2019e6ecfa2 (Block signals while allocating DSM memory.) /* * Block all blockable signals, except SIGQUIT. posix_fallocate() can run @@@ -364,8 -362,7 +368,12 @@@ * allowed SIGUSR1 to interrupt us repeatedly (for example, due to recovery * conflicts), the retry loop might never succeed. */ ++<<<<<<< HEAD + if (IsUnderPostmaster) + sigprocmask(SIG_SETMASK, &BlockSig, &save_sigmask); ++======= + PG_SETMASK(&BlockSig); ++>>>>>>> 2019e6ecfa2 (Block signals while allocating DSM memory.) /* Truncate (or extend) the file to the requested size. */ do @@@ -405,12 -402,9 +413,18 @@@ } #endif /* HAVE_POSIX_FALLOCATE && __linux__ */ ++<<<<<<< HEAD + if (IsUnderPostmaster) + { + save_errno = errno; + sigprocmask(SIG_SETMASK, &save_sigmask, NULL); + errno = save_errno; + } ++======= + save_errno = errno; + PG_SETMASK(&UnBlockSig); + errno = save_errno; ++>>>>>>> 2019e6ecfa2 (Block signals while allocating DSM memory.) return rc; } (END) ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
