NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit2a08477

committed

Use standard SIGHUP and SIGTERM signal handlers in worker_spi.

Previously worker_spi used its custom signal handlers for SIGHUP andSIGTERM. This commit makes worker_spi use the standard signal handlers,to simplify the code.Note that die() is used as the standard SIGTERM signal handler inworker_spi instead of SignalHandlerForShutdownRequest() or bgworker_die().Previously the exit handling was only able to exit from within the main loop,and not from within the backend code it calls. This is why die() needs tobe used here, so worker_spi can respond to SIGTERM signal while it'sexecuting a query.Maybe we can say that it's a bug that worker_spi could not respond toSIGTERM during query execution. But since worker_spi is a just exampleof the background worker code, we don't do the back-patch.Thanks to Craig Ringer for the report and investigation of the issue.Author: Bharath RupireddyReviewed-by: Fujii MasaoDiscussion:https://postgr.es/m/CALj2ACXDEZhAFOTDcqO9cFSRvrFLyYOnPKrcA1UG4uZn9hUAVg@mail.gmail.comDiscussion:https://postgr.es/m/CAGRY4nxsAe_1k_9g5b47orA0S011iBoHsXHFMH7cg7HV0O1bwQ@mail.gmail.com

1 parent0926e96 commit2a08477Copy full SHA for 2a08477

File tree

1 file changed

-43

lines changed

src/test/modules/worker_spi
- worker_spi.c

1 file changed

-43

lines changed

`‎src/test/modules/worker_spi/worker_spi.c`

Lines changed: 9 additions & 43 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`/* These are always necessary for a bgworker */`
`26`	`26`	`#include"miscadmin.h"`
`27`	`27`	`#include"postmaster/bgworker.h"`
	`28`	`+#include"postmaster/interrupt.h"`
`28`	`29`	`#include"storage/ipc.h"`
`29`	`30`	`#include"storage/latch.h"`
`30`	`31`	`#include"storage/lwlock.h"`
`@@ -48,10 +49,6 @@ PG_FUNCTION_INFO_V1(worker_spi_launch);`
`48`	`49`	`void_PG_init(void);`
`49`	`50`	`voidworker_spi_main(Datum)pg_attribute_noreturn();`
`50`	`51`
`51`		`-/* flags set by signal handlers */`
`52`		`-staticvolatilesig_atomic_tgot_sighup= false;`
`53`		`-staticvolatilesig_atomic_tgot_sigterm= false;`
`54`		`-`
`55`	`52`	`/* GUC variables */`
`56`	`53`	`staticintworker_spi_naptime=10;`
`57`	`54`	`staticintworker_spi_total_workers=2;`
`@@ -64,38 +61,6 @@ typedef struct worktable`
`64`	`61`	`constchar*name;`
`65`	`62`	`}worktable;`
`66`	`63`
`67`		`-/*`
`68`		`- * Signal handler for SIGTERM`
`69`		`- *Set a flag to let the main loop to terminate, and set our latch to wake`
`70`		`- *it up.`
`71`		`- */`
`72`		`-staticvoid`
`73`		`-worker_spi_sigterm(SIGNAL_ARGS)`
`74`		`-{`
`75`		`-intsave_errno=errno;`
`76`		`-`
`77`		`-got_sigterm= true;`
`78`		`-SetLatch(MyLatch);`
`79`		`-`
`80`		`-errno=save_errno;`
`81`		`-}`
`82`		`-`
`83`		`-/*`
`84`		`- * Signal handler for SIGHUP`
`85`		`- *Set a flag to tell the main loop to reread the config file, and set`
`86`		`- *our latch to wake it up.`
`87`		`- */`
`88`		`-staticvoid`
`89`		`-worker_spi_sighup(SIGNAL_ARGS)`
`90`		`-{`
`91`		`-intsave_errno=errno;`
`92`		`-`
`93`		`-got_sighup= true;`
`94`		`-SetLatch(MyLatch);`
`95`		`-`
`96`		`-errno=save_errno;`
`97`		`-}`
`98`		`-`
`99`	`64`	`/*`
`100`	`65`	`* Initialize workspace for a worker process: create the schema if it doesn't`
`101`	`66`	`* already exist.`
`@@ -179,8 +144,8 @@ worker_spi_main(Datum main_arg)`
`179`	`144`	`table->name=pstrdup("counted");`
`180`	`145`
`181`	`146`	`/* Establish signal handlers before unblocking signals. */`
`182`		`-pqsignal(SIGHUP,worker_spi_sighup);`
`183`		`-pqsignal(SIGTERM,worker_spi_sigterm);`
	`147`	`+pqsignal(SIGHUP,SignalHandlerForConfigReload);`
	`148`	`+pqsignal(SIGTERM,die);`
`184`	`149`
`185`	`150`	`/* We're now ready to receive signals */`
`186`	`151`	`BackgroundWorkerUnblockSignals();`
`@@ -219,9 +184,10 @@ worker_spi_main(Datum main_arg)`
`219`	`184`	`table->name);`
`220`	`185`
`221`	`186`	`/*`
`222`		`- * Main loop: do this until the SIGTERM handler tells us to terminate`
	`187`	`+ * Main loop: do this until SIGTERM is received and processed by`
	`188`	`+ * ProcessInterrupts.`
`223`	`189`	`*/`
`224`		`-while (!got_sigterm)`
	`190`	`+for (;;)`
`225`	`191`	`{`
`226`	`192`	`intret;`
`227`	`193`
`@@ -242,9 +208,9 @@ worker_spi_main(Datum main_arg)`
`242`	`208`	`/*`
`243`	`209`	`* In case of a SIGHUP, just reload the configuration.`
`244`	`210`	`*/`
`245`		`-if (got_sighup)`
	`211`	`+if (ConfigReloadPending)`
`246`	`212`	`{`
`247`		`-got_sighup= false;`
	`213`	`+ConfigReloadPending= false;`
`248`	`214`	`ProcessConfigFile(PGC_SIGHUP);`
`249`	`215`	`}`
`250`	`216`
`@@ -303,7 +269,7 @@ worker_spi_main(Datum main_arg)`
`303`	`269`	`pgstat_report_activity(STATE_IDLE,NULL);`
`304`	`270`	`}`
`305`	`271`
`306`		`-proc_exit(1);`
	`272`	`+/* Not reachable */`
`307`	`273`	`}`
`308`	`274`
`309`	`275`	`/*`

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!

Commit2a08477

File tree

1 file changed

1 file changed

`‎src/test/modules/worker_spi/worker_spi.c`

0 commit comments