diff options
author | Michael Paquier <michael@paquier.xyz> | 2018-08-29 17:10:02 -0700 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2018-08-29 17:10:02 -0700 |
commit | 55875b6d2aa0946226e9261ee691cb519d92f8c1 (patch) | |
tree | af31c9ffb140b8f1db7805b62aa0ae4850751b81 /src | |
parent | e0a0cc28d0829bea5d339fc2db6ac26ea13d5ab4 (diff) | |
download | postgresql-55875b6d2aa0946226e9261ee691cb519d92f8c1.tar.gz postgresql-55875b6d2aa0946226e9261ee691cb519d92f8c1.zip |
Stop bgworkers during fast shutdown with postmaster in startup phase
When a postmaster gets into its phase PM_STARTUP, it would start
background workers using BgWorkerStart_PostmasterStart mode immediately,
which would cause problems for a fast shutdown as the postmaster forgets
to send SIGTERM to already-started background workers. With smart and
immediate shutdowns, this correctly happened, and fast shutdown is the
only mode missing the shot.
Author: Alexander Kukushkin
Reviewed-by: Michael Paquier
Discussion: https://postgr.es/m/CAFh8B=mvnD8+DZUfzpi50DoaDfZRDfd7S=gwj5vU9GYn8UvHkA@mail.gmail.com
Backpatch-through: 9.5
Diffstat (limited to 'src')
-rw-r--r-- | src/backend/postmaster/postmaster.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index a4b53b33cdd..2215ebbb5a5 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2685,7 +2685,7 @@ pmdie(SIGNAL_ARGS) signal_child(BgWriterPID, SIGTERM); if (WalReceiverPID != 0) signal_child(WalReceiverPID, SIGTERM); - if (pmState == PM_RECOVERY) + if (pmState == PM_STARTUP || pmState == PM_RECOVERY) { SignalSomeChildren(SIGTERM, BACKEND_TYPE_BGWORKER); |