Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9e101cf

Browse files
committed
docs: replace 'master' with 'primary' where appropriate.
Also changed "in the primary" to "on the primary", and added a few "the" before "primary". Author: Andres Freund Reviewed-By: David Steele Discussion: https://postgr.es/m/20200615182235.x7lch5n6kcjq4aue@alap3.anarazel.de
1 parent e076336 commit 9e101cf

15 files changed

+86
-87
lines changed

doc/src/sgml/amcheck.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ SET client_min_messages = DEBUG1;
253253
implies that operating system collation rules must never change.
254254
Though rare, updates to operating system collation rules can
255255
cause these issues. More commonly, an inconsistency in the
256-
collation order between a master server and a standby server is
256+
collation order between a primary server and a standby server is
257257
implicated, possibly because the <emphasis>major</emphasis> operating
258258
system version in use is inconsistent. Such inconsistencies will
259259
generally only arise on standby servers, and so can generally

doc/src/sgml/backup.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ SELECT * FROM pg_stop_backup(false, true);
964964
non-exclusive one, but it differs in a few key steps. This type of
965965
backup can only be taken on a primary and does not allow concurrent
966966
backups. Moreover, because it creates a backup label file, as
967-
described below, it can block automatic restart of the master server
967+
described below, it can block automatic restart of the primary server
968968
after a crash. On the other hand, the erroneous removal of this
969969
file from a backup or standby is a common mistake, which can result
970970
in serious data corruption. If it is necessary to use this method,
@@ -1033,9 +1033,9 @@ SELECT pg_start_backup('label', true);
10331033
this will result in corruption. Confusion about when it is appropriate
10341034
to remove this file is a common cause of data corruption when using this
10351035
method; be very certain that you remove the file only on an existing
1036-
master and never when building a standby or restoring a backup, even if
1036+
primary and never when building a standby or restoring a backup, even if
10371037
you are building a standby that will subsequently be promoted to a new
1038-
master.
1038+
primary.
10391039
</para>
10401040
</listitem>
10411041
<listitem>
@@ -1128,16 +1128,16 @@ SELECT pg_stop_backup();
11281128
<para>
11291129
It is often a good idea to also omit from the backup the files
11301130
within the cluster's <filename>pg_replslot/</filename> directory, so that
1131-
replication slots that exist on the master do not become part of the
1131+
replication slots that exist on the primary do not become part of the
11321132
backup. Otherwise, the subsequent use of the backup to create a standby
11331133
may result in indefinite retention of WAL files on the standby, and
1134-
possibly bloat on the master if hot standby feedback is enabled, because
1134+
possibly bloat on the primary if hot standby feedback is enabled, because
11351135
the clients that are using those replication slots will still be connecting
1136-
to and updating the slots on the master, not the standby. Even if the
1137-
backup is only intended for use in creating a new master, copying the
1136+
to and updating the slots on the primary, not the standby. Even if the
1137+
backup is only intended for use in creating a new primary, copying the
11381138
replication slots isn't expected to be particularly useful, since the
11391139
contents of those slots will likely be badly out of date by the time
1140-
the new master comes on line.
1140+
the new primary comes on line.
11411141
</para>
11421142

11431143
<para>

doc/src/sgml/config.sgml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ include_dir 'conf.d'
697697

698698
<para>
699699
When running a standby server, you must set this parameter to the
700-
same or higher value than on the master server. Otherwise, queries
700+
same or higher value than on the primary server. Otherwise, queries
701701
will not be allowed in the standby server.
702702
</para>
703703
</listitem>
@@ -1643,7 +1643,7 @@ include_dir 'conf.d'
16431643

16441644
<para>
16451645
When running a standby server, you must set this parameter to the
1646-
same or higher value than on the master server. Otherwise, queries
1646+
same or higher value than on the primary server. Otherwise, queries
16471647
will not be allowed in the standby server.
16481648
</para>
16491649
</listitem>
@@ -2259,7 +2259,7 @@ include_dir 'conf.d'
22592259

22602260
<para>
22612261
When running a standby server, you must set this parameter to the
2262-
same or higher value than on the master server. Otherwise, queries
2262+
same or higher value than on the primary server. Otherwise, queries
22632263
will not be allowed in the standby server.
22642264
</para>
22652265

@@ -3253,7 +3253,7 @@ include_dir 'conf.d'
32533253
<varname>archive_timeout</varname> &mdash; it will bloat your archive
32543254
storage. <varname>archive_timeout</varname> settings of a minute or so are
32553255
usually reasonable. You should consider using streaming replication,
3256-
instead of archiving, if you want data to be copied off the master
3256+
instead of archiving, if you want data to be copied off the primary
32573257
server more quickly than that.
32583258
If this value is specified without units, it is taken as seconds.
32593259
This parameter can only be set in the
@@ -3678,12 +3678,12 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
36783678
These settings control the behavior of the built-in
36793679
<firstterm>streaming replication</firstterm> feature (see
36803680
<xref linkend="streaming-replication"/>). Servers will be either a
3681-
master or a standby server. Masters can send data, while standbys
3681+
primary or a standby server. Primaries can send data, while standbys
36823682
are always receivers of replicated data. When cascading replication
36833683
(see <xref linkend="cascading-replication"/>) is used, standby servers
36843684
can also be senders, as well as receivers.
36853685
Parameters are mainly for sending and standby servers, though some
3686-
parameters have meaning only on the master server. Settings may vary
3686+
parameters have meaning only on the primary server. Settings may vary
36873687
across the cluster without problems if that is required.
36883688
</para>
36893689

@@ -3693,10 +3693,10 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
36933693
<para>
36943694
These parameters can be set on any server that is
36953695
to send replication data to one or more standby servers.
3696-
The master is always a sending server, so these parameters must
3697-
always be set on the master.
3696+
The primary is always a sending server, so these parameters must
3697+
always be set on the primary.
36983698
The role and meaning of these parameters does not change after a
3699-
standby becomes the master.
3699+
standby becomes the primary.
37003700
</para>
37013701

37023702
<variablelist>
@@ -3724,7 +3724,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
37243724

37253725
<para>
37263726
When running a standby server, you must set this parameter to the
3727-
same or higher value than on the master server. Otherwise, queries
3727+
same or higher value than on the primary server. Otherwise, queries
37283728
will not be allowed in the standby server.
37293729
</para>
37303730
</listitem>
@@ -3855,19 +3855,19 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"' # Windows
38553855
</variablelist>
38563856
</sect2>
38573857

3858-
<sect2 id="runtime-config-replication-master">
3859-
<title>Master Server</title>
3858+
<sect2 id="runtime-config-replication-primary">
3859+
<title>Primary Server</title>
38603860

38613861
<para>
3862-
These parameters can be set on the master/primary server that is
3862+
These parameters can be set on the primary server that is
38633863
to send replication data to one or more standby servers.
38643864
Note that in addition to these parameters,
3865-
<xref linkend="guc-wal-level"/> must be set appropriately on the master
3865+
<xref linkend="guc-wal-level"/> must be set appropriately on the primary
38663866
server, and optionally WAL archiving can be enabled as
38673867
well (see <xref linkend="runtime-config-wal-archiving"/>).
38683868
The values of these parameters on standby servers are irrelevant,
38693869
although you may wish to set them there in preparation for the
3870-
possibility of a standby becoming the master.
3870+
possibility of a standby becoming the primary.
38713871
</para>
38723872

38733873
<variablelist>
@@ -4042,7 +4042,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
40424042

40434043
<para>
40444044
These settings control the behavior of a standby server that is
4045-
to receive replication data. Their values on the master server
4045+
to receive replication data. Their values on the primary server
40464046
are irrelevant.
40474047
</para>
40484048

@@ -4369,18 +4369,18 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
43694369
of time. For example, if
43704370
you set this parameter to <literal>5min</literal>, the standby will
43714371
replay each transaction commit only when the system time on the standby
4372-
is at least five minutes past the commit time reported by the master.
4372+
is at least five minutes past the commit time reported by the primary.
43734373
If this value is specified without units, it is taken as milliseconds.
43744374
The default is zero, adding no delay.
43754375
</para>
43764376
<para>
43774377
It is possible that the replication delay between servers exceeds the
43784378
value of this parameter, in which case no delay is added.
43794379
Note that the delay is calculated between the WAL time stamp as written
4380-
on master and the current time on the standby. Delays in transfer
4380+
on primary and the current time on the standby. Delays in transfer
43814381
because of network lag or cascading replication configurations
43824382
may reduce the actual wait time significantly. If the system
4383-
clocks on master and standby are not synchronized, this may lead to
4383+
clocks on primary and standby are not synchronized, this may lead to
43844384
recovery applying records earlier than expected; but that is not a
43854385
major issue because useful settings of this parameter are much larger
43864386
than typical time deviations between servers.
@@ -4402,7 +4402,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
44024402
except crash recovery.
44034403

44044404
<varname>hot_standby_feedback</varname> will be delayed by use of this feature
4405-
which could lead to bloat on the master; use both together with care.
4405+
which could lead to bloat on the primary; use both together with care.
44064406

44074407
<warning>
44084408
<para>
@@ -8998,7 +8998,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
89988998

89998999
<para>
90009000
When running a standby server, you must set this parameter to the
9001-
same or higher value than on the master server. Otherwise, queries
9001+
same or higher value than on the primary server. Otherwise, queries
90029002
will not be allowed in the standby server.
90039003
</para>
90049004
</listitem>

doc/src/sgml/external-projects.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
<productname>PostgreSQL</productname> replication solutions can be developed
245245
externally. For example, <application> <ulink
246246
url="http://www.slony.info">Slony-I</ulink></application> is a popular
247-
master/standby replication solution that is developed independently
247+
primary/standby replication solution that is developed independently
248248
from the core project.
249249
</para>
250250
</sect1>

0 commit comments

Comments
 (0)