Skip to content

Commit 8bbfef8

Browse files
zuyuezuyue
committed
515
1 parent 4874e73 commit 8bbfef8

27 files changed

+14195
-15786
lines changed

‎postgresql/doc/src/sgml/ref/pg_rewind.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,22 @@ ____________________________________________________________________________-->
110110
<para>
111111
<application>pg_rewind</> examines the timeline histories of the source
112112
and target clusters to determine the point where they diverged, and
113-
expects to find WAL in the target cluster's <filename>pg_xlog</> directory
113+
expects to find WAL in the target cluster's <filename>pg_wal</> directory
114114
reaching all the way back to the point of divergence. The point of divergence
115115
can be found either on the target timeline, the source timeline, or their common
116116
ancestor. In the typical failover scenario where the target cluster was
117117
shut down soon after the divergence, this is not a problem, but if the
118118
target cluster ran for a long time after the divergence, the old WAL
119119
files might no longer be present. In that case, they can be manually
120-
copied from the WAL archive to the <filename>pg_xlog</> directory, or
120+
copied from the WAL archive to the <filename>pg_wal</> directory, or
121121
fetched on startup by configuring <filename>recovery.conf</>. The use of
122122
<application>pg_rewind</> is not limited to failover, e.g. a standby
123123
server can be promoted, run some write transactions, and then rewinded
124124
to become a standby again.
125125
</para>
126126
____________________________________________________________________________-->
127127
<para>
128-
<application>pg_rewind</>检查源集簇和目标集簇的时间线历史来判断它们在哪一点分叉，并且期望在目标集簇的<filename>pg_xlog</>目录中找到 WAL 来返回到分叉点。分叉点可能会在目标时间线、源时间线或者它们的共同祖先上找到。在典型的失效场景中，目标集簇在分叉后很快就被关闭，这不是问题，但是如果目标集簇在分叉后已经运行了很长时间，旧的 WAL 文件可能已经不存在了。在这样的情况下，它们可以被手工从 WAL 归档复制到<filename>pg_xlog</>目录，或者通过配置<filename>recovery.conf</>在启动时取得。<application>pg_rewind</>的使用并不限于故障切换的场景，例如一个后备服务器可能被提升、运行一些写事务，然后被倒回再次成为一个后备。
128+
<application>pg_rewind</>检查源集簇和目标集簇的时间线历史来判断它们在哪一点分叉，并且期望在目标集簇的<filename>pg_wal</>目录中找到 WAL 来返回到分叉点。分叉点可能会在目标时间线、源时间线或者它们的共同祖先上找到。在典型的失效场景中，目标集簇在分叉后很快就被关闭，这不是问题，但是如果目标集簇在分叉后已经运行了很长时间，旧的 WAL 文件可能已经不存在了。在这样的情况下，它们可以被手工从 WAL 归档复制到<filename>pg_wal</>目录，或者通过配置<filename>recovery.conf</>在启动时取得。<application>pg_rewind</>的使用并不限于故障切换的场景，例如一个后备服务器可能被提升、运行一些写事务，然后被倒回再次成为一个后备。
129129
</para>
130130

131131
<!--==========================orignal english content==========================
@@ -402,13 +402,13 @@ ____________________________________________________________________________-->
402402
<step>
403403
<!--==========================orignal english content==========================
404404
<para>
405-
Copy all other files such as <filename>pg_clog</filename> and
405+
Copy all other files such as <filename>pg_xact</filename> and
406406
configuration files from the source cluster to the target cluster
407407
(everything except the relation files).
408408
</para>
409409
____________________________________________________________________________-->
410410
<para>
411-
把所有其他诸如<filename>pg_clog</filename>和配置文件（除了关系文件之外所有的东西）从源集簇拷贝到目标集簇。
411+
把所有其他诸如<filename>pg_xact</filename>和配置文件（除了关系文件之外所有的东西）从源集簇拷贝到目标集簇。
412412
</para>
413413
</step>
414414
<step>

‎postgresql/doc/src/sgml/ref/pg_waldump.sgml

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
<!--
2-
doc/src/sgml/ref/pg_xlogdump.sgml
2+
doc/src/sgml/ref/pg_waldump.sgml
33
PostgreSQL documentation
44
-->
55

6-
<refentry id="pgxlogdump">
6+
<refentry id="pgwaldump">
77
<!--==========================orignal english content==========================
8-
<indexterm zone="pgxlogdump">
9-
<primary>pg_xlogdump</primary>
8+
<indexterm zone="pgwaldump">
9+
<primary>pg_waldump</primary>
1010
</indexterm>
1111
____________________________________________________________________________-->
12-
<indexterm zone="pgxlogdump">
13-
<primary>pg_xlogdump</primary>
12+
<indexterm zone="pgwaldump">
13+
<primary>pg_waldump</primary>
1414
</indexterm>
1515

1616
<!--==========================orignal english content==========================
1717
<refmeta>
18-
<refentrytitle><application>pg_xlogdump</application></refentrytitle>
18+
<refentrytitle><application>pg_waldump</application></refentrytitle>
1919
<manvolnum>1</manvolnum>
2020
<refmiscinfo>Application</refmiscinfo>
2121
</refmeta>
2222
____________________________________________________________________________-->
2323
<refmeta>
24-
<refentrytitle><application>pg_xlogdump</application></refentrytitle>
24+
<refentrytitle><application>pg_waldump</application></refentrytitle>
2525
<manvolnum>1</manvolnum>
2626
<refmiscinfo>Application</refmiscinfo>
2727
</refmeta>
2828

2929
<!--==========================orignal english content==========================
3030
<refnamediv>
31-
<refname>pg_xlogdump</refname>
31+
<refname>pg_waldump</refname>
3232
<refpurpose>display a human-readable rendering of the write-ahead log of a <productname>PostgreSQL</productname> database cluster</refpurpose>
3333
</refnamediv>
3434
____________________________________________________________________________-->
3535
<refnamediv>
36-
<refname>pg_xlogdump</refname>
36+
<refname>pg_waldump</refname>
3737
<refpurpose>以人类可读的形式显示一个<productname>PostgreSQL</productname>
3838
数据库集簇的预写式日志</refpurpose>
3939
</refnamediv>
4040

4141
<refsynopsisdiv>
4242
<!--==========================orignal english content==========================
4343
<cmdsynopsis>
44-
<command>pg_xlogdump</command>
44+
<command>pg_waldump</command>
4545
<arg rep="repeat" choice="opt"><option>option</option></arg>
4646
<arg choice="opt"><option>startseg</option>
4747
<arg choice="opt"><option>endseg</option></arg>
4848
</arg>
4949
</cmdsynopsis>
5050
____________________________________________________________________________-->
5151
<cmdsynopsis>
52-
<command>pg_xlogdump</command>
52+
<command>pg_waldump</command>
5353
<arg rep="repeat" choice="opt"><option>option</option></arg>
5454
<arg choice="opt"><option>startseg</option>
5555
<arg choice="opt"><option>endseg</option></arg>
5656
</arg>
5757
</cmdsynopsis>
5858
</refsynopsisdiv>
5959

60-
<refsect1 id="R1-APP-PGXLOGDUMP-1">
60+
<refsect1 id="R1-APP-PGWALDUMP-1">
6161
<!--==========================orignal english content==========================
6262
<title>Description</title>
6363
____________________________________________________________________________-->
6464
<title>简介</title>
6565
<!--==========================orignal english content==========================
6666
<para>
67-
<command>pg_xlogdump</command> displays the write-ahead log (WAL) and is mainly
67+
<command>pg_waldump</command> displays the write-ahead log (WAL) and is mainly
6868
useful for debugging or educational purposes.
6969
</para>
7070
____________________________________________________________________________-->
7171
<para>
72-
<command>pg_xlogdump</command>显示预写式日志（WAL），它主要
72+
<command>pg_waldump</command>显示预写式日志（WAL），它主要
7373
用于调试或者教育目的。
7474
</para>
7575

@@ -131,7 +131,7 @@ ____________________________________________________________________________-->
131131
<term><option>-&minus;end=<replaceable>end</replaceable></option></term>
132132
<listitem>
133133
<para>
134-
Stop reading at the specified log position, instead of reading to the
134+
Stop reading at the specified WAL location, instead of reading to the
135135
end of the log stream.
136136
</para>
137137
</listitem>
@@ -163,9 +163,12 @@ ____________________________________________________________________________-->
163163
<term><option>-&minus;path=<replaceable>path</replaceable></option></term>
164164
<listitem>
165165
<para>
166-
Directory in which to find log segment files. The default is to search
167-
for them in the <literal>pg_xlog</literal> subdirectory of the current
168-
directory.
166+
Specifies a directory to search for log segment files or a
167+
directory with a <literal>pg_wal</literal> subdirectory that
168+
contains such files. The default is to search in the current
169+
directory, the <literal>pg_wal</literal> subdirectory of the
170+
current directory, and the <literal>pg_wal</literal> subdirectory
171+
of <envar>PGDATA</envar>.
169172
</para>
170173
</listitem>
171174
</varlistentry>
@@ -187,7 +190,7 @@ ____________________________________________________________________________-->
187190
<term><option>-&minus;start=<replaceable>start</replaceable></option></term>
188191
<listitem>
189192
<para>
190-
Log position at which to start reading. The default is to start reading
193+
WAL location at which to start reading. The default is to start reading
191194
the first valid log record found in the earliest file found.
192195
</para>
193196
</listitem>
@@ -210,7 +213,7 @@ ____________________________________________________________________________-->
210213
<term><option>-&minus;version</></term>
211214
<listitem>
212215
<para>
213-
Print the <application>pg_xlogdump</application> version and exit.
216+
Print the <application>pg_waldump</application> version and exit.
214217
</para>
215218
</listitem>
216219
</varlistentry>
@@ -242,7 +245,7 @@ ____________________________________________________________________________-->
242245
<term><option>-&minus;help</></term>
243246
<listitem>
244247
<para>
245-
Show help about <application>pg_xlogdump</application> command line
248+
Show help about <application>pg_waldump</application> command line
246249
arguments, and exit.
247250
</para>
248251
</listitem>
@@ -289,7 +292,7 @@ ____________________________________________________________________________-->
289292
<term><option>--end=<replaceable>end</replaceable></option></term>
290293
<listitem>
291294
<para>
292-
在指定的日志位置停止读取，而不是一直读取到日志流的末尾。
295+
在指定的WAL位置停止读取，而不是一直读取到日志流的末尾。
293296
</para>
294297
</listitem>
295298
</varlistentry>
@@ -319,8 +322,9 @@ ____________________________________________________________________________-->
319322
<term><option>--path=<replaceable>path</replaceable></option></term>
320323
<listitem>
321324
<para>
322-
要在哪个目录中寻找日志段文件。默认是在当前目录的<literal>pg_xlog</literal>
323-
子目录中搜索。
325+
指定搜索日志段文件的目录或包含这些文件的包含<literal>pg_wal</literal>子目录的目录。
326+
缺省值是在当前目录中搜索，当前目录的<literal>pg_wal</literal>子目录和
327+
<envar>PGDATA</envar>的<literal>pg_wal</literal>子目录。
324328
</para>
325329
</listitem>
326330
</varlistentry>
@@ -341,7 +345,7 @@ ____________________________________________________________________________-->
341345
<term><option>--start=<replaceable>start</replaceable></option></term>
342346
<listitem>
343347
<para>
344-
要从哪个日志位置开始读取。默认是从找到的最早的文件的第一个可用日志记录开始。
348+
要从哪个WAL位置开始读取。默认是从找到的最早的文件的第一个可用日志记录开始。
345349
</para>
346350
</listitem>
347351
</varlistentry>
@@ -362,7 +366,7 @@ ____________________________________________________________________________-->
362366
<term><option>--version</></term>
363367
<listitem>
364368
<para>
365-
打印<application>pg_xlogdump</application>版本并且退出。
369+
打印<application>pg_waldump</application>版本并且退出。
366370
</para>
367371
</listitem>
368372
</varlistentry>
@@ -394,7 +398,7 @@ ____________________________________________________________________________-->
394398
<term><option>--help</></term>
395399
<listitem>
396400
<para>
397-
显示有关<application>pg_xlogdump</application>命令行参数的帮助并且退出。
401+
显示有关<application>pg_waldump</application>命令行参数的帮助并且退出。
398402
</para>
399403
</listitem>
400404
</varlistentry>
@@ -429,13 +433,13 @@ ____________________________________________________________________________-->
429433

430434
<!--==========================orignal english content==========================
431435
<para>
432-
<application>pg_xlogdump</> cannot read WAL files with suffix
436+
<application>pg_waldump</> cannot read WAL files with suffix
433437
<literal>.partial</>. If those files need to be read, <literal>.partial</>
434438
suffix needs to be removed from the file name.
435439
</para>
436440
____________________________________________________________________________-->
437441
<para>
438-
<application>pg_xlogdump</>不能读取具有后缀<literal>.partial</>
442+
<application>pg_waldump</>不能读取具有后缀<literal>.partial</>
439443
的 WAL 文件。如果需要读取那些文件，需要从文件名中移除
440444
<literal>.partial</>后缀。
441445
</para>

0 commit comments

Comments
 (0)