diff options
| author | Andres Freund <andres@anarazel.de> | 2017-06-05 18:53:41 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2017-06-05 19:18:15 -0700 |
| commit | 703f148e98ecb4b299fdad403fc5a1de51220714 (patch) | |
| tree | 6f6d70af2a15f51949990235b5dbf97ff7e1c38a /src/backend/postmaster/postmaster.c | |
| parent | 41a21bf9b4a2449eddc8ea2b29597e835eea9bfd (diff) | |
| download | postgresql-703f148e98ecb4b299fdad403fc5a1de51220714.tar.gz postgresql-703f148e98ecb4b299fdad403fc5a1de51220714.zip | |
Revert "Prevent panic during shutdown checkpoint"
This reverts commit 086221cf6b1727c2baed4703c582f657b7c5350e, which
was made to master only.
The approach implemented in the above commit has some issues. While
those could easily be fixed incrementally, doing so would make
backpatching considerably harder, so instead first revert this patch.
Discussion: https://postgr.es/m/20170602002912.tqlwn4gymzlxpvs2@alap3.anarazel.de
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 35b4ec88d35..5c79b1e40d1 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2918,7 +2918,7 @@ reaper(SIGNAL_ARGS) * Waken walsenders for the last time. No regular backends * should be around anymore. */ - SignalChildren(SIGINT); + SignalChildren(SIGUSR2); pmState = PM_SHUTDOWN_2; @@ -3656,9 +3656,7 @@ PostmasterStateMachine(void) /* * If we get here, we are proceeding with normal shutdown. All * the regular children are gone, and it's time to tell the - * checkpointer to do a shutdown checkpoint. All WAL senders - * are told to switch to a stopping state so that the shutdown - * checkpoint can go ahead. + * checkpointer to do a shutdown checkpoint. */ Assert(Shutdown > NoShutdown); /* Start the checkpointer if not running */ @@ -3667,7 +3665,6 @@ PostmasterStateMachine(void) /* And tell it to shut down */ if (CheckpointerPID != 0) { - SignalSomeChildren(SIGUSR2, BACKEND_TYPE_WALSND); signal_child(CheckpointerPID, SIGUSR2); pmState = PM_SHUTDOWN; } |