]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Refactor ProcessRecoveryConflictInterrupt for readability
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Tue, 10 Feb 2026 14:23:10 +0000 (16:23 +0200)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Tue, 10 Feb 2026 14:23:10 +0000 (16:23 +0200)
commitbe5257725d7f65708f5955a3a4beaedaa370e45b
tree417d0446e0a706788a6c129f8f26e1682dea6600
parent17f51ea818753093f929b4c235f3b89ebcc7c5fb
Refactor ProcessRecoveryConflictInterrupt for readability

Two changes here:

1. Introduce a separate RECOVERY_CONFLICT_BUFFERPIN_DEADLOCK flag to
indicate a suspected deadlock that involves a buffer pin. Previously
the startup process used the same flag for a deadlock involving just
regular locks, and to check for deadlocks involving the buffer
pin. The cases are handled separately in the startup process, but the
receiving backend had to deduce which one it was based on
HoldingBufferPinThatDelaysRecovery(). With a separate flag, the
receiver doesn't need to guess.

2. Rewrite the ProcessRecoveryConflictInterrupt() function to not rely
on fallthrough through the switch-statement. That was difficult to
read.

Reviewed-by: Chao Li <li.evan.chao@gmail.com>
Discussion: https://www.postgresql.org/message-id/4cc13ba1-4248-4884-b6ba-4805349e7f39@iki.fi
src/backend/storage/ipc/standby.c
src/backend/tcop/postgres.c
src/backend/utils/activity/pgstat_database.c
src/include/storage/standby.h