Stop bgworkers during fast shutdown with postmaster in startup phase

michaelpq · michaelpq · commit 55875b6d2aa0 · 2018-08-29T17:10:02.000-07:00
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
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -2685,7 +2685,7 @@ pmdie(SIGNAL_ARGS)`
`2685`	`2685`	`signal_child(BgWriterPID, SIGTERM);`
`2686`	`2686`	`if (WalReceiverPID != 0)`
`2687`	`2687`	`signal_child(WalReceiverPID, SIGTERM);`
`2688`		`- if (pmState == PM_RECOVERY)`
	`2688`	`+ if (pmState == PM_STARTUP \|\| pmState == PM_RECOVERY)`
`2689`	`2689`	`{`
`2690`	`2690`	`SignalSomeChildren(SIGTERM, BACKEND_TYPE_BGWORKER);`
`2691`	`2691`