Fix an oversight in 3f28b2fcac. Commit 3f28b2fcac tried to ensure that the replication origin shouldn't be advanced in case of an ERROR in the apply worker, so that it can request the same data again after restart. However, it is possible that an ERROR was caught and handled by a (say PL/pgSQL) function, and the apply worker continues to apply further changes, in which case, we shouldn't reset the replication origin.
Ensure to reset the origin only when the apply worker exits after an ERROR. Commit 3f28b2fcac added new function geterrlevel, which we removed in HEAD as part of this commit, but kept it in backbranches to avoid breaking any applications. A separate case can be made to have such a function even for HEAD. Reported-by: Shawn McCoy <shawn.the.mc...@gmail.com> Author: Hayato Kuroda <kuroda.hay...@fujitsu.com> Reviewed-by: Masahiko Sawada <sawada.m...@gmail.com> Reviewed-by: vignesh C <vignes...@gmail.com> Reviewed-by: Amit Kapila <amit.kapil...@gmail.com> Backpatch-through: 16, where it was introduced Discussion: https://postgr.es/m/calsgzncgara2mcynvtsj9uopcjo-tpuwugecrekpngtpo31...@mail.gmail.com Branch ------ master Details ------- https://git.postgresql.org/pg/commitdiff/0e091ce409e06cd89baf81306cc92c496d8ba58d Modified Files -------------- src/backend/replication/logical/worker.c | 21 +++++---- src/backend/utils/error/elog.c | 17 ------- src/include/utils/elog.h | 1 - src/test/subscription/t/100_bugs.pl | 77 ++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 29 deletions(-)
