database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-24 14:22:24 +03:00
Code Activity

postmaster: Adjust which processes we expect to have exited

Browse Source 
Comments and code stated that we expect checkpointer to have been signalled in
case of immediate shutdown / fatal errors, but didn't treat archiver and
walsenders the same. That doesn't seem right.

I had started digging through the history to see where this oddity was
introduced, but it's not the fault of a single commit.

Instead treat archiver, checkpointer, and walsenders the same.

Reviewed-by: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Discussion: https://postgr.es/m/kgng5nrvnlv335evmsuvpnh354rw7qyazl73kdysev2cr2v5zu@m3cfzxicm5kp
This commit is contained in:
Andres Freund
2025-01-24 17:00:10 -05:00
parent 463a2ebd9f
commit f15538cd27
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/postmaster/postmaster.c
View File

@ -2919,16 +2919,20 @@ PostmasterStateMachine(void)
/*
* If we are doing crash recovery or an immediate shutdown then we
* expect the checkpointer to exit as well, otherwise not.
* expect archiver, checkpointer and walsender to exit as well,
* otherwise not.
*/
if (FatalError || Shutdown >= ImmediateShutdown)
targetMask = btmask_add(targetMask, B_CHECKPOINTER);
targetMask = btmask_add(targetMask,
B_CHECKPOINTER,
B_ARCHIVER,
B_WAL_SENDER);
/*
* Walsenders and archiver will continue running; they will be
* terminated later after writing the checkpoint record. We also let
* dead-end children to keep running for now. The syslogger process
* exits last.
* Normally walsenders and archiver will continue running; they will
* be terminated later after writing the checkpoint record. We also
* let dead-end children to keep running for now. The syslogger
* process exits last.
*
* This assertion checks that we have covered all backend types,
* either by including them in targetMask, or by noting here that they
@ -2939,13 +2943,17 @@ PostmasterStateMachine(void)
BackendTypeMask remainMask = BTYPE_MASK_NONE;
remainMask = btmask_add(remainMask,
B_WAL_SENDER,
B_ARCHIVER,
B_DEAD_END_BACKEND,
B_LOGGER);
/* checkpointer may or may not be in targetMask already */
remainMask = btmask_add(remainMask, B_CHECKPOINTER);
/*
* Archiver, checkpointer and walsender may or may not be in
* targetMask already.
*/
remainMask = btmask_add(remainMask,
B_ARCHIVER,
B_CHECKPOINTER,
B_WAL_SENDER);
/* these are not real postmaster children */
remainMask = btmask_add(remainMask,