Fix a deadlock during ALTER SUBSCRIPTION ... DROP PUBLICATION. A deadlock can occur when the DDL command and the apply worker acquire catalog locks in different orders while dropping replication origins.
The issue is rare in PG16 and higher branches because, in most cases, the tablesync worker performs the origin drop in those branches, and its locking sequence does not conflict with DDL operations. This patch ensures consistent lock acquisition to prevent such deadlocks. As per buildfarm. Reported-by: Alexander Lakhin <[email protected]> Author: Ajin Cherian <[email protected]> Reviewed-by: Hayato Kuroda <[email protected]> Reviewed-by: vignesh C <[email protected]> Reviewed-by: Amit Kapila <[email protected]> Backpatch-through: 14, where it was introduced Discussion: https://postgr.es/m/[email protected] Branch ------ REL_16_STABLE Details ------- https://git.postgresql.org/pg/commitdiff/adfd8021911a302499187483c93814d24ca5ac44 Modified Files -------------- src/backend/catalog/pg_subscription.c | 33 +++++++++++++++++++++++++---- src/backend/replication/logical/tablesync.c | 27 ++++++++++++++++++++--- src/include/catalog/pg_subscription_rel.h | 2 ++ 3 files changed, 55 insertions(+), 7 deletions(-)
