diff options
| -rw-r--r-- | contrib/worker_spi/worker_spi.c | 6 | ||||
| -rw-r--r-- | src/backend/replication/walreceiver.c | 4 | ||||
| -rw-r--r-- | src/backend/replication/walsender.c | 18 |
3 files changed, 21 insertions, 7 deletions
diff --git a/contrib/worker_spi/worker_spi.c b/contrib/worker_spi/worker_spi.c index 99501fa5668..beffab1cad2 100644 --- a/contrib/worker_spi/worker_spi.c +++ b/contrib/worker_spi/worker_spi.c @@ -79,15 +79,19 @@ worker_spi_sigterm(SIGNAL_ARGS) /* * Signal handler for SIGHUP - * Set a flag to let the main loop to reread the config file, and set + * Set a flag to tell the main loop to reread the config file, and set * our latch to wake it up. */ static void worker_spi_sighup(SIGNAL_ARGS) { + int save_errno = errno; + got_sighup = true; if (MyProc) SetLatch(&MyProc->procLatch); + + errno = save_errno; } /* diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index 7fe80a94a30..ae087535f78 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -737,7 +737,11 @@ WalRcvSigHupHandler(SIGNAL_ARGS) static void WalRcvSigUsr1Handler(SIGNAL_ARGS) { + int save_errno = errno; + latch_sigusr1_handler(); + + errno = save_errno; } /* SIGTERM: set flag for main loop, or shutdown immediately if safe */ diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index afd559dae46..cdd9c6a5334 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1214,17 +1214,23 @@ InitWalSenderSlot(void) static void WalSndKill(int code, Datum arg) { - Assert(MyWalSnd != NULL); + WalSnd *walsnd = MyWalSnd; + + Assert(walsnd != NULL); + + /* + * Clear MyWalSnd first; then disown the latch. This is so that signal + * handlers won't try to touch the latch after it's no longer ours. + */ + MyWalSnd = NULL; + + DisownLatch(&walsnd->latch); /* * Mark WalSnd struct no longer in use. Assume that no lock is required * for this. */ - MyWalSnd->pid = 0; - DisownLatch(&MyWalSnd->latch); - - /* WalSnd struct isn't mine anymore */ - MyWalSnd = NULL; + walsnd->pid = 0; } /* |