diff options
| author | Andres Freund <andres@anarazel.de> | 2017-06-08 15:00:53 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2017-06-08 15:38:50 -0700 |
| commit | 2c48f5db64b1b999b08052115a5ce873343c372a (patch) | |
| tree | 135bf4827ff26ca27680087da070fbc94e1f1e2c /src/backend/tcop/postgres.c | |
| parent | 5fd56b9f5b4a007a4122c313a184f78f1647c4ab (diff) | |
| download | postgresql-2c48f5db64b1b999b08052115a5ce873343c372a.tar.gz postgresql-2c48f5db64b1b999b08052115a5ce873343c372a.zip | |
Use standard interrupt handling in logical replication launcher.
Previously the exit handling was only able to exit from within the
main loop, and not from within the backend code it calls. Fix that by
using the standard die() SIGTERM handler, and adding the necessary
CHECK_FOR_INTERRUPTS() call.
This requires adding yet another process-type-specific branch to
ProcessInterrupts(), which hints that we probably should generalize
that handling. But that's work for another day.
Author: Petr Jelinek
Reviewed-By: Andres Freund
Discussion: https://postgr.es/m/fe072153-babd-3b5d-8052-73527a6eb657@2ndquadrant.com
Diffstat (limited to 'src/backend/tcop/postgres.c')
| -rw-r--r-- | src/backend/tcop/postgres.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index 1c60b431631..91ca8df2ea7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -55,6 +55,7 @@ #include "pg_getopt.h" #include "postmaster/autovacuum.h" #include "postmaster/postmaster.h" +#include "replication/logicallauncher.h" #include "replication/logicalworker.h" #include "replication/slot.h" #include "replication/walsender.h" @@ -2848,6 +2849,14 @@ ProcessInterrupts(void) ereport(FATAL, (errcode(ERRCODE_ADMIN_SHUTDOWN), errmsg("terminating logical replication worker due to administrator command"))); + else if (IsLogicalLauncher()) + { + ereport(DEBUG1, + (errmsg("logical replication launcher shutting down"))); + + /* The logical replication launcher can be stopped at any time. */ + proc_exit(0); + } else if (RecoveryConflictPending && RecoveryConflictRetryable) { pgstat_report_recovery_conflict(RecoveryConflictReason); |