AlterSubscription_refresh: avoid stomping on global variable
authorAlvaro Herrera <[email protected]>
Fri, 7 May 2021 15:46:37 +0000 (11:46 -0400)
committerAlvaro Herrera <[email protected]>
Fri, 7 May 2021 15:46:37 +0000 (11:46 -0400)
commit1803c76260006fb8b866bdc8112b9b51f0a32fef
tree8c0953852131bef782d2a051102046262e01f79b
parentf414bd8e4efed6d7fd2a56789cdf56116539b595
AlterSubscription_refresh: avoid stomping on global variable

This patch replaces use of the global "wrconn" variable in
AlterSubscription_refresh with a local variable of the same name, making
it consistent with other functions in subscriptioncmds.c (e.g.
DropSubscription).

The global wrconn is only meant to be used for logical apply/tablesync worker.
Abusing it this way is known to cause trouble if an apply worker
manages to do a subscription refresh, such as reported by Jeremy Finzel
and diagnosed by Andres Freund back in November 2020, at
https://www.postgresql.org/message-id/20201111215820[email protected]

Backpatch to 10.  In branch master, also move the connection establishment
to occur outside the PG_TRY block; this way we can remove a test for NULL in
PG_FINALLY, and it also makes the code more consistent with similar code in
the same file.

Author: Peter Smith <[email protected]>
Reviewed-by: Bharath Rupireddy <[email protected]>
Reviewed-by: Japin Li <[email protected]>
Discussion: https://postgr.es/m/CAHut+Pu7Jv9L2BOEx_Z0UtJxfDevQSAUW2mJqWU+CtmDrEZVAg@mail.gmail.com
src/backend/commands/subscriptioncmds.c