forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commitef70b6f
committed
AlterSubscription_refresh: avoid stomping on global variable
This patch replaces use of the global "wrconn" variable inAlterSubscription_refresh with a local variable of the same name, makingit 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 workermanages to do a subscription refresh, such as reported by Jeremy Finzeland diagnosed by Andres Freund back in November 2020, athttps://www.postgresql.org/message-id/20201111215820.qihhrz7fayu6myfi@alap3.anarazel.deBackpatch to 10. In branch master, also move the connection establishmentto occur outside the PG_TRY block; this way we can remove a test for NULL inPG_FINALLY, and it also makes the code more consistent with similar code inthe same file.Author: Peter Smith <peter.b.smith@fujitsu.com>Reviewed-by: Bharath Rupireddy <bharath.rupireddyforpostgres@gmail.com>Reviewed-by: Japin Li <japinli@hotmail.com>Discussion:https://postgr.es/m/CAHut+Pu7Jv9L2BOEx_Z0UtJxfDevQSAUW2mJqWU+CtmDrEZVAg@mail.gmail.com1 parentf518c3d commitef70b6f
1 file changed
+2
-1
lines changedLines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
517 | 517 | | |
518 | 518 | | |
519 | 519 | | |
| 520 | + | |
520 | 521 | | |
521 | 522 | | |
522 | 523 | | |
| |||
835 | 836 | | |
836 | 837 | | |
837 | 838 | | |
838 | | - | |
| 839 | + | |
839 | 840 | | |
840 | 841 | | |
841 | 842 | | |
| |||
0 commit comments
Comments
(0)