pgsql: Refactor ProcessRecoveryConflictInterrupt for readability

From: Heikki Linnakangas <heikki(dot)linnakangas(at)iki(dot)fi>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Refactor ProcessRecoveryConflictInterrupt for readability
Date: 2026-02-10 14:32:37
Message-ID: E1vpon6-002LVr-31@gemulon.postgresql.org
Views: Whole Thread | Raw Message | Download mbox | Resend email
Thread:
Lists: pgsql-committers

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(dot)evan(dot)chao(at)gmail(dot)com>
Discussion: https://www.postgresql.org/message-id/4cc13ba1-4248-4884-b6ba-4805349e7f39@iki.fi

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/be5257725d7f65708f5955a3a4beaedaa370e45b

Modified Files
--------------
src/backend/storage/ipc/standby.c | 7 +-
src/backend/tcop/postgres.c | 262 ++++++++++++++++-----------
src/backend/utils/activity/pgstat_database.c | 10 +
src/include/storage/standby.h | 10 +-
4 files changed, 181 insertions(+), 108 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Bertrand Drouvot 2026-02-10 15:19:09 Re: pgsql: Separate RecoveryConflictReasons from procsignals
Previous Message Michael Paquier 2026-02-10 07:59:31 pgsql: Simplify some log messages in extended_stats_funcs.c