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

Commit 85c1132

Browse files
committed
Rename user-facing tools with "xlog" in the name to say "wal".
This means pg_receivexlog because pg_receivewal, pg_resetxlog becomes pg_resetwal, and pg_xlogdump becomes pg_waldump.
1 parent 5d2adf0 commit 85c1132

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+191
-189
lines changed

doc/src/sgml/protocol.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1321,7 +1321,7 @@ the connection to be used for logical replication from that database.
13211321
psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
13221322
</programlisting>
13231323
However, it is often more useful to use
1324-
<xref linkend="app-pgreceivexlog"> (for physical replication) or
1324+
<xref linkend="app-pgreceivewal"> (for physical replication) or
13251325
<xref linkend="app-pgrecvlogical"> (for logical replication).
13261326
</para>
13271327

doc/src/sgml/ref/allfiles.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,15 @@ Complete list of usable sgml source files in this directory.
198198
<!ENTITY pgDump SYSTEM "pg_dump.sgml">
199199
<!ENTITY pgDumpall SYSTEM "pg_dumpall.sgml">
200200
<!ENTITY pgIsready SYSTEM "pg_isready.sgml">
201-
<!ENTITY pgReceivexlog SYSTEM "pg_receivexlog.sgml">
201+
<!ENTITY pgReceivewal SYSTEM "pg_receivewal.sgml">
202202
<!ENTITY pgRecvlogical SYSTEM "pg_recvlogical.sgml">
203-
<!ENTITY pgResetxlog SYSTEM "pg_resetxlog.sgml">
203+
<!ENTITY pgResetwal SYSTEM "pg_resetwal.sgml">
204204
<!ENTITY pgRestore SYSTEM "pg_restore.sgml">
205205
<!ENTITY pgRewind SYSTEM "pg_rewind.sgml">
206206
<!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml">
207207
<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
208208
<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml">
209-
<!ENTITY pgxlogdump SYSTEM "pg_xlogdump.sgml">
209+
<!ENTITY pgwaldump SYSTEM "pg_waldump.sgml">
210210
<!ENTITY postgres SYSTEM "postgres-ref.sgml">
211211
<!ENTITY postmaster SYSTEM "postmaster.sgml">
212212
<!ENTITY psqlRef SYSTEM "psql-ref.sgml">

doc/src/sgml/ref/pg_receivexlog.sgml renamed to doc/src/sgml/ref/pg_receivewal.sgml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<!--
2-
doc/src/sgml/ref/pg_receivexlog.sgml
2+
doc/src/sgml/ref/pg_receivewal.sgml
33
PostgreSQL documentation
44
-->
55

6-
<refentry id="app-pgreceivexlog">
7-
<indexterm zone="app-pgreceivexlog">
8-
<primary>pg_receivexlog</primary>
6+
<refentry id="app-pgreceivewal">
7+
<indexterm zone="app-pgreceivewal">
8+
<primary>pg_receivewal</primary>
99
</indexterm>
1010

1111
<refmeta>
12-
<refentrytitle>pg_receivexlog</refentrytitle>
12+
<refentrytitle>pg_receivewal</refentrytitle>
1313
<manvolnum>1</manvolnum>
1414
<refmiscinfo>Application</refmiscinfo>
1515
</refmeta>
1616

1717
<refnamediv>
18-
<refname>pg_receivexlog</refname>
18+
<refname>pg_receivewal</refname>
1919
<refpurpose>stream transaction logs from a <productname>PostgreSQL</productname> server</refpurpose>
2020
</refnamediv>
2121

2222
<refsynopsisdiv>
2323
<cmdsynopsis>
24-
<command>pg_receivexlog</command>
24+
<command>pg_receivewal</command>
2525
<arg rep="repeat"><replaceable>option</></arg>
2626
</cmdsynopsis>
2727
</refsynopsisdiv>
@@ -31,7 +31,7 @@ PostgreSQL documentation
3131
Description
3232
</title>
3333
<para>
34-
<application>pg_receivexlog</application> is used to stream the transaction log
34+
<application>pg_receivewal</application> is used to stream the transaction log
3535
from a running <productname>PostgreSQL</productname> cluster. The transaction
3636
log is streamed using the streaming replication protocol, and is written
3737
to a local directory of files. This directory can be used as the archive
@@ -40,16 +40,16 @@ PostgreSQL documentation
4040
</para>
4141

4242
<para>
43-
<application>pg_receivexlog</application> streams the transaction
43+
<application>pg_receivewal</application> streams the transaction
4444
log in real time as it's being generated on the server, and does not wait
4545
for segments to complete like <xref linkend="guc-archive-command"> does.
4646
For this reason, it is not necessary to set
4747
<xref linkend="guc-archive-timeout"> when using
48-
<application>pg_receivexlog</application>.
48+
<application>pg_receivewal</application>.
4949
</para>
5050

5151
<para>
52-
Unlike the WAL receiver of a PostgreSQL standby server, <application>pg_receivexlog</>
52+
Unlike the WAL receiver of a PostgreSQL standby server, <application>pg_receivewal</>
5353
by default flushes WAL data only when a WAL file is closed.
5454
The option <option>--synchronous</> must be specified to flush WAL data
5555
in real time.
@@ -68,7 +68,7 @@ PostgreSQL documentation
6868

6969
<para>
7070
If the connection is lost, or if it cannot be initially established,
71-
with a non-fatal error, <application>pg_receivexlog</application> will
71+
with a non-fatal error, <application>pg_receivewal</application> will
7272
retry the connection indefinitely, and reestablish streaming as soon
7373
as possible. To avoid this behavior, use the <literal>-n</literal>
7474
parameter.
@@ -132,17 +132,17 @@ PostgreSQL documentation
132132
<term><option>--slot=<replaceable class="parameter">slotname</replaceable></option></term>
133133
<listitem>
134134
<para>
135-
Require <application>pg_receivexlog</application> to use an existing
135+
Require <application>pg_receivewal</application> to use an existing
136136
replication slot (see <xref linkend="streaming-replication-slots">).
137-
When this option is used, <application>pg_receivexlog</> will report
137+
When this option is used, <application>pg_receivewal</> will report
138138
a flush position to the server, indicating when each segment has been
139139
synchronized to disk so that the server can remove that segment if it
140140
is not otherwise needed.
141141
</para>
142142

143143
<para>
144144
When the replication client
145-
of <application>pg_receivexlog</application> is configured on the
145+
of <application>pg_receivewal</application> is configured on the
146146
server as a synchronous standby, then using a replication slot will
147147
report the flush position to the server, but only when a WAL file is
148148
closed. Therefore, that configuration will cause transactions on the
@@ -164,7 +164,7 @@ PostgreSQL documentation
164164

165165
<para>
166166
This option should be specified if the replication client
167-
of <application>pg_receivexlog</application> is configured on the
167+
of <application>pg_receivewal</application> is configured on the
168168
server as a synchronous standby, to ensure that timely feedback is
169169
sent to the server.
170170
</para>
@@ -209,7 +209,7 @@ PostgreSQL documentation
209209
</para>
210210
<para>
211211
The option is called <literal>--dbname</> for consistency with other
212-
client applications, but because <application>pg_receivexlog</application>
212+
client applications, but because <application>pg_receivewal</application>
213213
doesn't connect to any particular database in the cluster, database
214214
name in the connection string will be ignored.
215215
</para>
@@ -273,15 +273,15 @@ PostgreSQL documentation
273273
<term><option>--password</option></term>
274274
<listitem>
275275
<para>
276-
Force <application>pg_receivexlog</application> to prompt for a
276+
Force <application>pg_receivewal</application> to prompt for a
277277
password before connecting to a database.
278278
</para>
279279

280280
<para>
281281
This option is never essential, since
282-
<application>pg_receivexlog</application> will automatically prompt
282+
<application>pg_receivewal</application> will automatically prompt
283283
for a password if the server demands password authentication.
284-
However, <application>pg_receivexlog</application> will waste a
284+
However, <application>pg_receivewal</application> will waste a
285285
connection attempt finding out that the server wants a password.
286286
In some cases it is worth typing <option>-W</> to avoid the extra
287287
connection attempt.
@@ -292,7 +292,7 @@ PostgreSQL documentation
292292
</para>
293293

294294
<para>
295-
<application>pg_receivexlog</application> can perform one of the two
295+
<application>pg_receivewal</application> can perform one of the two
296296
following actions in order to control physical replication slots:
297297

298298
<variablelist>
@@ -327,7 +327,7 @@ PostgreSQL documentation
327327
<term><option>--version</></term>
328328
<listitem>
329329
<para>
330-
Print the <application>pg_receivexlog</application> version and exit.
330+
Print the <application>pg_receivewal</application> version and exit.
331331
</para>
332332
</listitem>
333333
</varlistentry>
@@ -337,7 +337,7 @@ PostgreSQL documentation
337337
<term><option>--help</></term>
338338
<listitem>
339339
<para>
340-
Show help about <application>pg_receivexlog</application> command line
340+
Show help about <application>pg_receivewal</application> command line
341341
arguments, and exit.
342342
</para>
343343
</listitem>
@@ -363,7 +363,7 @@ PostgreSQL documentation
363363
<title>Notes</title>
364364

365365
<para>
366-
When using <application>pg_receivexlog</application> instead of
366+
When using <application>pg_receivewal</application> instead of
367367
<xref linkend="guc-archive-command"> as the main WAL backup method, it is
368368
strongly recommended to use replication slots. Otherwise, the server is
369369
free to recycle or remove transaction log files before they are backed up,
@@ -384,7 +384,7 @@ PostgreSQL documentation
384384
<literal>mydbserver</literal> and store it in the local directory
385385
<filename>/usr/local/pgsql/archive</filename>:
386386
<screen>
387-
<prompt>$</prompt> <userinput>pg_receivexlog -h mydbserver -D /usr/local/pgsql/archive</userinput>
387+
<prompt>$</prompt> <userinput>pg_receivewal -h mydbserver -D /usr/local/pgsql/archive</userinput>
388388
</screen></para>
389389
</refsect1>
390390

doc/src/sgml/ref/pg_recvlogical.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ PostgreSQL documentation
3535

3636
<para>
3737
It creates a replication-mode connection, so it is subject to the same
38-
constraints as <xref linkend="app-pgreceivexlog">, plus those for logical
38+
constraints as <xref linkend="app-pgreceivewal">, plus those for logical
3939
replication (see <xref linkend="logicaldecoding">).
4040
</para>
4141

@@ -238,7 +238,7 @@ PostgreSQL documentation
238238
<listitem>
239239
<para>
240240
This option has the same effect as the option of the same name
241-
in <xref linkend="app-pgreceivexlog">. See the description there.
241+
in <xref linkend="app-pgreceivewal">. See the description there.
242242
</para>
243243
</listitem>
244244
</varlistentry>
@@ -411,7 +411,7 @@ PostgreSQL documentation
411411
<title>See Also</title>
412412

413413
<simplelist type="inline">
414-
<member><xref linkend="app-pgreceivexlog"></member>
414+
<member><xref linkend="app-pgreceivewal"></member>
415415
</simplelist>
416416
</refsect1>
417417
</refentry>

doc/src/sgml/ref/pg_resetxlog.sgml renamed to doc/src/sgml/ref/pg_resetwal.sgml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
<!--
2-
doc/src/sgml/ref/pg_resetxlog.sgml
2+
doc/src/sgml/ref/pg_resetwal.sgml
33
PostgreSQL documentation
44
-->
55

6-
<refentry id="APP-PGRESETXLOG">
7-
<indexterm zone="app-pgresetxlog">
8-
<primary>pg_resetxlog</primary>
6+
<refentry id="APP-PGRESETWAL">
7+
<indexterm zone="app-pgresetwal">
8+
<primary>pg_resetwal</primary>
99
</indexterm>
1010

1111
<refmeta>
12-
<refentrytitle><application>pg_resetxlog</application></refentrytitle>
12+
<refentrytitle><application>pg_resetwal</application></refentrytitle>
1313
<manvolnum>1</manvolnum>
1414
<refmiscinfo>Application</refmiscinfo>
1515
</refmeta>
1616

1717
<refnamediv>
18-
<refname>pg_resetxlog</refname>
18+
<refname>pg_resetwal</refname>
1919
<refpurpose>reset the write-ahead log and other control information of a <productname>PostgreSQL</productname> database cluster</refpurpose>
2020
</refnamediv>
2121

2222
<refsynopsisdiv>
2323
<cmdsynopsis>
24-
<command>pg_resetxlog</command>
24+
<command>pg_resetwal</command>
2525
<arg choice="opt"><option>-f</option></arg>
2626
<arg choice="opt"><option>-n</option></arg>
2727
<arg rep="repeat"><replaceable>option</replaceable></arg>
2828
<arg choice="req"><arg choice="opt"><option>-D</option></arg> <replaceable class="parameter">datadir</replaceable></arg>
2929
</cmdsynopsis>
3030
</refsynopsisdiv>
3131

32-
<refsect1 id="R1-APP-PGRESETXLOG-1">
32+
<refsect1 id="R1-APP-PGRESETWAL-1">
3333
<title>Description</title>
3434
<para>
35-
<command>pg_resetxlog</command> clears the write-ahead log (WAL) and
35+
<command>pg_resetwal</command> clears the write-ahead log (WAL) and
3636
optionally resets some other control information stored in the
3737
<filename>pg_control</> file. This function is sometimes needed
3838
if these files have become corrupted. It should be used only as a
@@ -51,12 +51,12 @@ PostgreSQL documentation
5151
This utility can only be run by the user who installed the server, because
5252
it requires read/write access to the data directory.
5353
For safety reasons, you must specify the data directory on the command line.
54-
<command>pg_resetxlog</command> does not use the environment variable
54+
<command>pg_resetwal</command> does not use the environment variable
5555
<envar>PGDATA</>.
5656
</para>
5757

5858
<para>
59-
If <command>pg_resetxlog</command> complains that it cannot determine
59+
If <command>pg_resetwal</command> complains that it cannot determine
6060
valid data for <filename>pg_control</>, you can force it to proceed anyway
6161
by specifying the <option>-f</> (force) option. In this case plausible
6262
values will be substituted for the missing data. Most of the fields can be
@@ -80,7 +80,7 @@ PostgreSQL documentation
8080
<term><option>-f</option></term>
8181
<listitem>
8282
<para>
83-
Force <command>pg_resetxlog</command> to proceed even if it cannot determine
83+
Force <command>pg_resetwal</command> to proceed even if it cannot determine
8484
valid data for <filename>pg_control</>, as explained above.
8585
</para>
8686
</listitem>
@@ -91,10 +91,10 @@ PostgreSQL documentation
9191
<listitem>
9292
<para>
9393
The <option>-n</> (no operation) option instructs
94-
<command>pg_resetxlog</command> to print the values reconstructed from
94+
<command>pg_resetwal</command> to print the values reconstructed from
9595
<filename>pg_control</> and values about to be changed, and then exit
9696
without modifying anything. This is mainly a debugging tool, but can be
97-
useful as a sanity check before allowing <command>pg_resetxlog</command>
97+
useful as a sanity check before allowing <command>pg_resetwal</command>
9898
to proceed for real.
9999
</para>
100100
</listitem>
@@ -115,7 +115,7 @@ PostgreSQL documentation
115115

116116
<para>
117117
The following options are only needed when
118-
<command>pg_resetxlog</command> is unable to determine appropriate values
118+
<command>pg_resetwal</command> is unable to determine appropriate values
119119
by reading <filename>pg_control</>. Safe values can be determined as
120120
described below. For values that take numeric arguments, hexadecimal
121121
values can be specified by using the prefix <literal>0x</literal>.
@@ -152,7 +152,7 @@ PostgreSQL documentation
152152

153153
<para>
154154
The transaction ID epoch is not actually stored anywhere in the database
155-
except in the field that is set by <command>pg_resetxlog</command>,
155+
except in the field that is set by <command>pg_resetwal</command>,
156156
so any value will work so far as the database itself is concerned.
157157
You might need to adjust this value to ensure that replication
158158
systems such as <application>Slony-I</> and
@@ -164,7 +164,7 @@ PostgreSQL documentation
164164
</varlistentry>
165165

166166
<varlistentry>
167-
<term><option>-l</option> <replaceable class="parameter">xlogfile</replaceable></term>
167+
<term><option>-l</option> <replaceable class="parameter">walfile</replaceable></term>
168168
<listitem>
169169
<para>
170170
Manually set the WAL starting address.
@@ -182,7 +182,7 @@ PostgreSQL documentation
182182

183183
<note>
184184
<para>
185-
<command>pg_resetxlog</command> itself looks at the files in
185+
<command>pg_resetwal</command> itself looks at the files in
186186
<filename>pg_wal</> and chooses a default <option>-l</> setting
187187
beyond the last existing file name. Therefore, manual adjustment of
188188
<option>-l</> should only be needed if you are aware of WAL segment
@@ -274,11 +274,11 @@ PostgreSQL documentation
274274

275275
<para>
276276
This command must not be used when the server is
277-
running. <command>pg_resetxlog</command> will refuse to start up if
277+
running. <command>pg_resetwal</command> will refuse to start up if
278278
it finds a server lock file in the data directory. If the
279279
server crashed then a lock file might have been left
280280
behind; in that case you can remove the lock file to allow
281-
<command>pg_resetxlog</command> to run. But before you do
281+
<command>pg_resetwal</command> to run. But before you do
282282
so, make doubly certain that there is no server process still alive.
283283
</para>
284284
</refsect1>

0 commit comments

Comments
 (0)