From 68b3bbf30e33b9f79e605899b6540e619329a119 Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Mon, 29 Jan 2024 16:24:41 +0900 Subject: [PATCH v4 5/5] Use die() instead of WalRcvShutdownSignalHandler() --- src/backend/replication/walreceiver.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index abaf21a20c..1e03d55062 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -73,6 +73,7 @@ #include "storage/proc.h" #include "storage/procarray.h" #include "storage/procsignal.h" +#include "tcop/tcopprot.h" #include "utils/acl.h" #include "utils/builtins.h" #include "utils/guc.h" @@ -147,25 +148,7 @@ static void XLogWalRcvSendReply(bool force, bool requestReply); static void XLogWalRcvSendHSFeedback(bool immed); static void ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime); static void WalRcvComputeNextWakeup(WalRcvWakeupReason reason, TimestampTz now); -static void WalRcvShutdownSignalHandler(SIGNAL_ARGS); -void -WalRcvShutdownSignalHandler(SIGNAL_ARGS) -{ - int save_errno = errno; - - /* Don't joggle the elbow of proc_exit */ - if (!proc_exit_inprogress) - { - InterruptPending = true; - ProcDiePending = true; - } - - SetLatch(MyLatch); - - errno = save_errno; - -} /* Main entry point for walreceiver process */ void @@ -263,7 +246,7 @@ WalReceiverMain(void) pqsignal(SIGHUP, SignalHandlerForConfigReload); /* set flag to read config * file */ pqsignal(SIGINT, SIG_IGN); - pqsignal(SIGTERM, WalRcvShutdownSignalHandler); /* request shutdown */ + pqsignal(SIGTERM, die); /* request shutdown */ /* SIGQUIT handler was already set up by InitPostmasterChild */ pqsignal(SIGALRM, SIG_IGN); pqsignal(SIGPIPE, SIG_IGN); -- 2.39.3