NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitef848f4

committed

Use standard SIGTERM signal handler die() in test_shm_mq worker.

Previously test_shm_mq worker used the stripped-down version of die()as the SIGTERM signal handler. This commit makes it use die(), instead,to simplify the code.In terms of the code, the difference between die() and the stripped-downversion previously used is whether the signal handler directly may callProcessInterrupts() or not. But this difference doesn't exist ina background worker because, in bgworker, DoingCommandRead flag willnever be true and die() will never call ProcessInterrupts() directly.Therefore test_shm_mq worker can safely use die(), like other bgworkerproceses (e.g., logical replication apply launcher or autoprewarm worker)currently do.Thanks to Craig Ringer for the report and investigation of the issue.Author: Bharath RupireddyReviewed-by: Fujii MasaoDiscussion:https://postgr.es/m/CAGRY4nxsAe_1k_9g5b47orA0S011iBoHsXHFMH7cg7HV0O1bwQ@mail.gmail.com

1 parent2a08477 commitef848f4Copy full SHA for ef848f4

File tree

1 file changed

-25

lines changed

src/test/modules/test_shm_mq
- worker.c

1 file changed

-25

lines changed

`‎src/test/modules/test_shm_mq/worker.c`

Lines changed: 3 additions & 25 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@`
`24`	`24`	`#include"storage/procarray.h"`
`25`	`25`	`#include"storage/shm_mq.h"`
`26`	`26`	`#include"storage/shm_toc.h"`
	`27`	`+#include"tcop/tcopprot.h"`
`27`	`28`
`28`	`29`	`#include"test_shm_mq.h"`
`29`	`30`
`30`		`-staticvoidhandle_sigterm(SIGNAL_ARGS);`
`31`	`31`	`staticvoidattach_to_queues(dsm_segmentseg,shm_toctoc,`
`32`	`32`	`intmyworkernumber,shm_mq_handle**inqhp,`
`33`	`33`	`shm_mq_handle**outqhp);`
`@@ -58,10 +58,9 @@ test_shm_mq_main(Datum main_arg)`
`58`	`58`	`* Establish signal handlers.`
`59`	`59`	`*`
`60`	`60`	`* We want CHECK_FOR_INTERRUPTS() to kill off this worker process just as`
`61`		`- * it would a normal user backend. To make that happen, we establish a`
`62`		`- * signal handler that is a stripped-down version of die().`
	`61`	`+ * it would a normal user backend. To make that happen, we use die().`
`63`	`62`	`*/`
`64`		`-pqsignal(SIGTERM,handle_sigterm);`
	`63`	`+pqsignal(SIGTERM,die);`
`65`	`64`	`BackgroundWorkerUnblockSignals();`
`66`	`65`
`67`	`66`	`/*`
`@@ -196,24 +195,3 @@ copy_messages(shm_mq_handle inqh, shm_mq_handle outqh)`
`196`	`195`	`break;`
`197`	`196`	`}`
`198`	`197`	`}`
`199`		`-`
`200`		`-/*`
`201`		`- * When we receive a SIGTERM, we set InterruptPending and ProcDiePending just`
`202`		`- * like a normal backend. The next CHECK_FOR_INTERRUPTS() will do the right`
`203`		`- * thing.`
`204`		`- */`
`205`		`-staticvoid`
`206`		`-handle_sigterm(SIGNAL_ARGS)`
`207`		`-{`
`208`		`-intsave_errno=errno;`
`209`		`-`
`210`		`-SetLatch(MyLatch);`
`211`		`-`
`212`		`-if (!proc_exit_inprogress)`
`213`		`-{`
`214`		`-InterruptPending= true;`
`215`		`-ProcDiePending= true;`
`216`		`-}`
`217`		`-`
`218`		`-errno=save_errno;`
`219`		`-}`

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!

Commitef848f4

File tree

1 file changed

1 file changed

`‎src/test/modules/test_shm_mq/worker.c`

0 commit comments