Re: 024_add_drop_pub.pl might fail due to deadlock - Mailing list pgsql-hackers

On Thu, Jul 31, 2025 at 2:37 PM vignesh C <vignesh21@gmail.com> wrote:
>
> How about we change the below:
> +#ifdef USE_ASSERT_CHECKING
> +               LOCKTAG tag;
> +#endif
> +
> +               Assert(CheckRelationOidLockedByMe(SubscriptionRelRelationId,
> +
>            RowExclusiveLock, true));
> +
> +               rel = table_open(SubscriptionRelRelationId, NoLock);
> +#ifdef USE_ASSERT_CHECKING
> +               SET_LOCKTAG_OBJECT(tag, InvalidOid,
> SubscriptionRelationId, subid, 0);
> +               Assert(LockHeldByMe(&tag, AccessShareLock, true));
> +#endif
>
> to:
>  #ifdef USE_ASSERT_CHECKING
>         LOCKTAG tag;
>         Assert(CheckRelationOidLockedByMe(SubscriptionRelRelationId,
>                                           RowExclusiveLock, true));
>         SET_LOCKTAG_OBJECT(tag, InvalidOid, SubscriptionRelationId, subid, 0);
>         Assert(LockHeldByMe(&tag, AccessShareLock, true));
> #endif
>
>         rel = table_open(SubscriptionRelRelationId, NoLock);
>     }
>

Your suggested change looks better to me.

--
With Regards,
Amit Kapila.