diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-10-23 10:25:46 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-10-23 10:25:46 +0900 |
| commit | 399b8d13ca5cda44ed9c4aff10c85351d8e95cff (patch) | |
| tree | 63799da55ba5b0d93ea826da9e7b0d8b577cadab /src | |
| parent | 4f2ad52269750c9f04121251a23e7f6ed1fb911c (diff) | |
| download | postgresql-399b8d13ca5cda44ed9c4aff10c85351d8e95cff.tar.gz postgresql-399b8d13ca5cda44ed9c4aff10c85351d8e95cff.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/autovacuum.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index fd85b9c8f44..0b1e74f00bc 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(); |