NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commitbedadc7

committed

Make archiver's SIGQUIT handler exit via _exit().

Commit8e19a82 changed the SIGQUIT handlers of almost all serverprocesses not to run atexit callbacks. The archiver process wasskipped, perhaps because it's not connected to shared memory; butit's just as true here that running atexit callbacks in a signalhandler is unsafe. So let's make it work like the rest.In HEAD and v13, we can use the common SignalHandlerForCrashExithandler. Before that, just tweak pgarch_exit to use _exit(2)explicitly.Like the previous commit, back-patch to all supported branches.Kyotaro Horiguchi, back-patching by meDiscussion:https://postgr.es/m/1850884.1599601164@sss.pgh.pa.us

1 parent0aa8f76 commitbedadc7Copy full SHA for bedadc7

File tree

1 file changed

-10

lines changed

src/backend/postmaster
- pgarch.c

1 file changed

-10

lines changed

`‎src/backend/postmaster/pgarch.c`

Lines changed: 1 addition & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,6 @@ static pid_t pgarch_forkexec(void);`
`96`	`96`	`#endif`
`97`	`97`
`98`	`98`	`NON_EXEC_STATICvoidPgArchiverMain(intargc,char*argv[])pg_attribute_noreturn();`
`99`		`-staticvoidpgarch_exit(SIGNAL_ARGS);`
`100`	`99`	`staticvoidpgarch_waken(SIGNAL_ARGS);`
`101`	`100`	`staticvoidpgarch_waken_stop(SIGNAL_ARGS);`
`102`	`101`	`staticvoidpgarch_MainLoop(void);`
`@@ -229,7 +228,7 @@ PgArchiverMain(int argc, char *argv[])`
`229`	`228`	`pqsignal(SIGHUP,SignalHandlerForConfigReload);`
`230`	`229`	`pqsignal(SIGINT,SIG_IGN);`
`231`	`230`	`pqsignal(SIGTERM,SignalHandlerForShutdownRequest);`
`232`		`-pqsignal(SIGQUIT,pgarch_exit);`
	`231`	`+pqsignal(SIGQUIT,SignalHandlerForCrashExit);`
`233`	`232`	`pqsignal(SIGALRM,SIG_IGN);`
`234`	`233`	`pqsignal(SIGPIPE,SIG_IGN);`
`235`	`234`	`pqsignal(SIGUSR1,pgarch_waken);`
`@@ -246,14 +245,6 @@ PgArchiverMain(int argc, char *argv[])`
`246`	`245`	`exit(0);`
`247`	`246`	`}`
`248`	`247`
`249`		`-/* SIGQUIT signal handler for archiver process */`
`250`		`-staticvoid`
`251`		`-pgarch_exit(SIGNAL_ARGS)`
`252`		`-{`
`253`		`-/* SIGQUIT means curl up and die ... */`
`254`		`-exit(1);`
`255`		`-}`
`256`		`-`
`257`	`248`	`/* SIGUSR1 signal handler for archiver process */`
`258`	`249`	`staticvoid`
`259`	`250`	`pgarch_waken(SIGNAL_ARGS)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbedadc7

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/pgarch.c`

0 commit comments