rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid treating WAL senders as normal backends. 

The previous coding treated anything that wasn't an autovacuum launcher
as a normal backend, which is wrong now that we also have WAL senders.

Fujii Masao, reviewed by Robert Haas, Alvaro Herrera, Tom Lane,
and Bernd Helmle.
This commit is contained in:
Robert Haas 2011-01-21 22:20:06 -05:00
parent fb4c5d2798
commit a0c75f5539
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/backend/postmaster/postmaster.c
View File

@ -3167,13 +3167,25 @@ SignalSomeChildren(int signal, int target)
if (bp->dead_end) if (bp->dead_end)
continue; continue;
if (!(target & BACKEND_TYPE_NORMAL) && !bp->is_autovacuum)
continue; /*
if (!(target & BACKEND_TYPE_AUTOVAC) && bp->is_autovacuum) * Since target == BACKEND_TYPE_ALL is the most common case,
continue; * we test it first and avoid touching shared memory for
if (!(target & BACKEND_TYPE_WALSND) && * every child.
IsPostmasterChildWalSender(bp->child_slot)) */
continue; if (target != BACKEND_TYPE_ALL)
{
int child;
if (bp->is_autovacuum)
child = BACKEND_TYPE_AUTOVAC;
else if (IsPostmasterChildWalSender(bp->child_slot))
child = BACKEND_TYPE_WALSND;
else
child = BACKEND_TYPE_NORMAL;
if (!(target & child))
continue;
}
ereport(DEBUG4, ereport(DEBUG4,
(errmsg_internal("sending signal %d to process %d", (errmsg_internal("sending signal %d to process %d",
@ -4380,13 +4392,25 @@ CountChildren(int target)
if (bp->dead_end) if (bp->dead_end)
continue; continue;
if (!(target & BACKEND_TYPE_NORMAL) && !bp->is_autovacuum)
continue; /*
if (!(target & BACKEND_TYPE_AUTOVAC) && bp->is_autovacuum) * Since target == BACKEND_TYPE_ALL is the most common case,
continue; * we test it first and avoid touching shared memory for
if (!(target & BACKEND_TYPE_WALSND) && * every child.
IsPostmasterChildWalSender(bp->child_slot)) */
continue; if (target != BACKEND_TYPE_ALL)
{
int child;
if (bp->is_autovacuum)
child = BACKEND_TYPE_AUTOVAC;
else if (IsPostmasterChildWalSender(bp->child_slot))
child = BACKEND_TYPE_WALSND;
else
child = BACKEND_TYPE_NORMAL;
if (!(target & child))
continue;
}
cnt++; cnt++;
} }