postgres.git / summary / log / commit / refs

commit    e3db3f829f605edc0675e5d308de97f444b53d4b
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Oct 23 01:25:06 2019 +0000
First released in: 13.0, 9.4.25, 9.5.20, 9.6.16, 10.11, 11.6, 12.1

    Clean up properly error_context_stack in autovacuum worker on exception
    
    Any callback set would have no meaning in the context of an exception.
    As an autovacuum worker exits quickly in this context, this could be
    only an issue within EmitErrorReport(), where the elog hook is for
    example called.  That's unlikely to going to be a problem, but let's be
    clean and consistent with other code paths handling exceptions.  This is
    present since 2909419, which introduced autovacuum.
    
    Author: Ashwin Agrawal
    Reviewed-by: Tom Lane, Michael Paquier
    Discussion: https://postgr.es/m/CALfoeisM+_+dgmAdAOHAu0k-ZpEHHqSSG=GRf3pKJGm8OqWX0w@mail.gmail.com
    Backpatch-through: 9.4


 src/backend/postmaster/autovacuum.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 073f313337d..c1dd8168caf 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -1558,6 +1558,9 @@ AutoVacWorkerMain(int argc, char *argv[])
 	 */
 	if (sigsetjmp(local_sigjmp_buf, 1) != 0)
 	{
+		/* since not using PG_TRY, must reset error stack by hand */
+		error_context_stack = NULL;
+
 		/* Prevents interrupts while cleaning up */
 		HOLD_INTERRUPTS();
 


[parent: ad4b7aeb8443]