database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Make WL_POSTMASTER_DEATH level-triggered on kqueue builds.

Browse Source 
If WaitEventSetWait() reports that the postmaster has gone away, later
calls to WaitEventSetWait() should continue to report that.  Otherwise
further waits that occur in the proc_exit() path after we already
noticed the postmaster's demise could block forever.

Back-patch to 13, where the kqueue support landed.

Reported-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/3624029.1602701929%40sss.pgh.pa.us
This commit is contained in:
Thomas Munro
2020-10-15 11:31:20 +13:00
parent 855b6f2871
commit e0950135ae
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/storage/ipc/latch.c
View File

@@ -1429,7 +1429,10 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
timeout_p = &timeout; timeout_p = &timeout;
} }
/* Report events discovered by WaitEventAdjustKqueue(). */ /*
* Report postmaster events discovered by WaitEventAdjustKqueue() or an
* earlier call to WaitEventSetWait().
*/
if (unlikely(set->report_postmaster_not_running)) if (unlikely(set->report_postmaster_not_running))
{ {
if (set->exit_on_postmaster_death) if (set->exit_on_postmaster_death)
@@ -1500,6 +1503,13 @@ WaitEventSetWaitBlock(WaitEventSet *set, int cur_timeout,
cur_kqueue_event->filter == EVFILT_PROC && cur_kqueue_event->filter == EVFILT_PROC &&
(cur_kqueue_event->fflags & NOTE_EXIT) != 0) (cur_kqueue_event->fflags & NOTE_EXIT) != 0)
{ {
/*
* The kernel will tell this kqueue object only once about the exit
* of the postmaster, so let's remember that for next time so that
* we provide level-triggered semantics.
*/
set->report_postmaster_not_running = true;
if (set->exit_on_postmaster_death) if (set->exit_on_postmaster_death)
proc_exit(1); proc_exit(1);
occurred_events->fd = PGINVALID_SOCKET; occurred_events->fd = PGINVALID_SOCKET;