Skip to content

Commit 7c89f8a

Browse files
committed
docs: replace 'master process' with 'supervisor process' where appropriate.
Author: Andres Freund Reviewed-By: David Steele Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de
1 parent 09dfd43 commit 7c89f8a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

doc/src/sgml/arch-dev.sgml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@
122122
there is one <firstterm>client process</firstterm> connected to
123123
exactly one <firstterm>server process</firstterm>. As we do not
124124
know ahead of time how many connections will be made, we have to
125-
use a <firstterm>master process</firstterm> that spawns a new
126-
server process every time a connection is requested. This master
125+
use a <firstterm>supervisor process</firstterm> (also
126+
<firstterm>master process</firstterm>) that spawns a new
127+
server process every time a connection is requested. This supervisor
127128
process is called <literal>postgres</literal> and listens at a
128129
specified TCP/IP port for incoming connections. Whenever a request
129130
for a connection is detected the <literal>postgres</literal>

doc/src/sgml/runtime.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ default:\
12921292
optimal for <productname>PostgreSQL</productname>. Because of the
12931293
way that the kernel implements memory overcommit, the kernel might
12941294
terminate the <productname>PostgreSQL</productname> postmaster (the
1295-
master server process) if the memory demands of either
1295+
supervisor server process) if the memory demands of either
12961296
<productname>PostgreSQL</productname> or another process cause the
12971297
system to run out of virtual memory.
12981298
</para>
@@ -1465,7 +1465,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
14651465

14661466
<para>
14671467
There are several ways to shut down the database server. You control
1468-
the type of shutdown by sending different signals to the master
1468+
the type of shutdown by sending different signals to the supervisor
14691469
<command>postgres</command> process.
14701470

14711471
<variablelist>
@@ -1511,7 +1511,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
15111511
The server will send <systemitem>SIGQUIT</systemitem> to all child
15121512
processes and wait for them to terminate. If any do not terminate
15131513
within 5 seconds, they will be sent <systemitem>SIGKILL</systemitem>.
1514-
The master server process exits as soon as all child processes have
1514+
The supervisor server process exits as soon as all child processes have
15151515
exited, without doing normal database shutdown processing.
15161516
This will lead to recovery (by
15171517
replaying the WAL log) upon next start-up. This is recommended

doc/src/sgml/start.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
From that point on, the client and the new server process
114114
communicate without intervention by the original
115115
<filename>postgres</filename> process. Thus, the
116-
master server process is always running, waiting for
116+
supervisor server process is always running, waiting for
117117
client connections, whereas client and associated server processes
118118
come and go. (All of this is of course invisible to the user. We
119119
only mention it here for completeness.)

0 commit comments

Comments
 (0)