Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit3173e87

Browse files
author
Liudmila Mantrova
committed
DOC: sgml markup bug fixes and A.Lakhin's feedback
1 parent07f9681 commit3173e87

File tree

1 file changed

+43
-42
lines changed

1 file changed

+43
-42
lines changed

‎doc/src/sgml/pgprobackup.sgml

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ doc/src/sgml/pgprobackup.sgml
165165
To manage backup data, <application>pg_probackup</application> creates a
166166
special <emphasis>backup catalog</emphasis>. This directory
167167
stores all backup files with additional meta information, as
168-
well as <acronym>WAL</acronym> archives required for point-in-time recovery. To avoid
168+
well as <acronym>WAL</acronym> archives required for<link linkend="continuous-archiving">point-in-time recovery</link>. To avoid
169169
conflicts, <application>pg_probackup</application> does not allow storing
170170
backups for different clusters in a single backup catalog.
171171
</para>
@@ -366,7 +366,7 @@ pg_probackup init -B <replaceable>backupdir</replaceable> -D <replaceable>datadi
366366
</listitem>
367367
</itemizedlist>
368368
<para>
369-
The backup catalog mustbe accessible from the file
369+
The backup catalog mustbelong to the file
370370
system of the database server. The user launching
371371
<application>pg_probackup</application> must have full access to the
372372
contents of the backup catalog. If you specify the path to the
@@ -416,7 +416,7 @@ pg_probackup init -B <replaceable>backupdir</replaceable> -D <replaceable>datadi
416416
<listitem>
417417
<para>
418418
Create the <literal>backup</literal> role with the
419-
<link linkend="role-attributes"><literal>REPLICATION</literal>privilege</link>.
419+
<link linkend="role-attributes"><literal>LOGIN</literal> and <literal>REPLICATION</literal>privileges</link>.
420420
</para>
421421
<programlisting>
422422
CREATE ROLE backup WITH LOGIN REPLICATION;
@@ -436,14 +436,14 @@ CREATE ROLE backup WITH LOGIN REPLICATION;
436436
<itemizedlist spacing="compact">
437437
<listitem>
438438
<para>
439-
Make sure the <literal>max_wal_senders</literal>
439+
Make sure the <varname>max_wal_senders</varname>
440440
parameter is set high enough to leave at least one
441441
session available for the backup process.
442442
</para>
443443
</listitem>
444444
<listitem>
445445
<para>
446-
Set the <literal>wal_level</literal> parameter to be
446+
Set the <varname>wal_level</varname> parameter to be
447447
<literal>replica</literal> or higher.
448448
</para>
449449
</listitem>
@@ -495,14 +495,14 @@ CREATE ROLE backup WITH LOGIN;
495495
<listitem>
496496
<para>
497497
Set <literal>archive_mode</literal> to
498-
<literal>'on'</literal>.
498+
<literal>on</literal>.
499499
</para>
500500
</listitem>
501501
<listitem>
502502
<para>
503-
Set <literal>archive_command</literal> to
504-
<literal>'test ! -fbackup\_dir/wal/%f &amp;&amp; cp %pbackup\_dir/wal/%f';</literal>
505-
where <literal>backup_dir</literal> is the initialized
503+
Set <varname>archive_command</varname> to
504+
<literal>test ! -fbackup_dir/wal/%f &amp;&amp; cp %pbackup_dir/wal/%f</literal>
505+
where <replaceable>backup_dir</replaceable> is the initialized
506506
backup catalog.
507507
</para>
508508
</listitem>
@@ -543,8 +543,8 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
543543
<itemizedlist spacing="compact">
544544
<listitem>
545545
<para>
546-
Set the <literal>max_wal_senders</literal> and
547-
<literal>hot_standby</literal> parameters in
546+
Set the <varname>max_wal_senders</varname> and
547+
<varname>hot_standby</varname> parameters in
548548
<filename>postgresql.conf</filename>.
549549
</para>
550550
</listitem>
@@ -559,7 +559,7 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
559559
<listitem>
560560
<para>
561561
On the master server, enable
562-
<literal>full_page_writes</literal> in
562+
<varname>full_page_writes</varname> in
563563
<filename>postgresql.conf</filename>.
564564
</para>
565565
</listitem>
@@ -578,10 +578,10 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
578578
<listitem>
579579
<para>All <acronym>WAL</acronym> records required
580580
for the backup must contain sufficient full-page writes. This
581-
requires you to enable <literal>full_page_writes</literal> on
581+
requires you to enable <varname>full_page_writes</varname> on
582582
the master, and not to use a tool like
583-
<literal>pg_compresslog</literal> as
584-
<literal>archive_command</literal> to remove full-page writes
583+
<application>pg_compresslog</application> as
584+
<varname>archive_command</varname> to remove full-page writes
585585
from <acronym>WAL</acronym> files.
586586
</para>
587587
</listitem>
@@ -598,7 +598,7 @@ GRANT EXECUTE ON FUNCTION txid_snapshot_xmax(txid_snapshot) TO backup;
598598
<listitem>
599599
<para>
600600
In <filename>postgresql.conf</filename>, set
601-
<literal>ptrack_enable</literal> to <literal>'on'</literal>.
601+
<varname>ptrack_enable</varname> to <literal>on</literal>.
602602
</para>
603603
</listitem>
604604
<listitem>
@@ -699,7 +699,7 @@ pg_probackup backup -B <replaceable>backupdir</replaceable> -b <replaceable>back
699699
[-C] [--stream [-S <replaceable>slot-name</replaceable>]] [--backup-pg-log]
700700
-archive-timeout=<replaceable>timeout</replaceable>] [--delete-expired]
701701
[-d <replaceable>dbname</replaceable>] [-h <replaceable>host</replaceable>] [-p <replaceable>port</replaceable>] [-U <replaceable>username</replaceable>] [-w]
702-
[-j <replaceable>num-threads</replaceable>][--progress] [-q] [-v]
702+
[-j <replaceable>num_threads</replaceable>][--progress] [-q] [-v]
703703
</programlisting>
704704
<para>
705705
Creates a backup copy of the <productname>&productname;</productname> instance.
@@ -724,7 +724,7 @@ pg_probackup backup -B <replaceable>backupdir</replaceable> -b <replaceable>back
724724
pg_probackup restore -B <replaceable>backupdir</replaceable>
725725
[-D <replaceable>datadir</replaceable>]
726726
[ -i <replaceable>backup_id</replaceable> | [{--time=<replaceable>time</replaceable> | --xid=<replaceable>xid</replaceable> } [--inclusive=<replaceable>boolean</replaceable>]]][--timeline=<replaceable>timeline</replaceable>] [-T OLDDIR=<replaceable>NEWDIR</replaceable>]
727-
[-j <replaceable>num-threads</replaceable>] [--progress] [-q] [-v]
727+
[-j <replaceable>num_threads</replaceable>] [--progress] [-q] [-v]
728728
</programlisting>
729729
<para>
730730
Restores the <productname>&productname;</productname> instance from a backup copy
@@ -747,7 +747,7 @@ pg_probackup validate -B <replaceable>backupdir</replaceable>
747747
[-D <replaceable>datadir</replaceable>]
748748
[ -i <replaceable>backup_id</replaceable> | [{--time=<replaceable>time</replaceable> | --xid=<replaceable>xid</replaceable> } [--inclusive=<replaceable>boolean</replaceable>]]]
749749
[--timeline=<replaceable>timeline</replaceable>]
750-
[-j <replaceable>num-threads</replaceable>] [--progress] [-q] [-v]
750+
[-j <replaceable>num_threads</replaceable>] [--progress] [-q] [-v]
751751
</programlisting>
752752
<para>
753753
Verifies that all files in the backup are present and not corrupted.
@@ -789,7 +789,7 @@ pg_probackup delete -B <replaceable>backupdir</replaceable> {-i <replaceable>bac
789789
Deletes the specified backup files from the <replaceable>backupdir</replaceable> backup catalog:
790790
<itemizedlist spacing="compact">
791791
<listitem>
792-
<para>The <option>backup-id</option> option removes the specified backup copy.
792+
<para>The <option>-i</option> option removes the specified backup copy.
793793
</para>
794794
</listitem>
795795
<listitem>
@@ -815,7 +815,7 @@ pg_probackup delete -B <replaceable>backupdir</replaceable> {-i <replaceable>bac
815815
pg_probackup version
816816
</programlisting>
817817
<para>
818-
Shows the current version of<application>pg_probackup</application>.
818+
Prints<application>pg_probackup</application> version.
819819
</para>
820820
</listitem>
821821
</varlistentry>
@@ -1304,7 +1304,7 @@ pg_probackup backup -b FULL --stream
13041304
Autonomous backups include all the <acronym>WAL</acronym> segments required to restore the
13051305
cluster to a consistent state at the time the backup was taken. To restore a cluster
13061306
from an incremental autonomous backup, <application>pg_probackup</application> still
1307-
requiresa full backup and all theprevious incrementedbackups.
1307+
requiresthe full backup and all theincrementalbackups it depends on.
13081308
</para>
13091309

13101310
<para>
@@ -1356,10 +1356,10 @@ pg_probackup backup -b FULL --stream
13561356
</para>
13571357
<para>For example, to check that you can restore the
13581358
database cluster from a backup copy up to the specified
1359-
<literal>xid</literal> transaction ID, run this command:
1359+
<replaceable>xid</replaceable> transaction ID, run this command:
13601360
</para>
13611361
<programlisting>
1362-
pg_probackup validate --xid=xid
1362+
pg_probackup validate --xid=<replaceable>xid</replaceable>
13631363
</programlisting>
13641364
<para>
13651365
If validation completes successfully,
@@ -1438,7 +1438,7 @@ pg_probackup restore -D <replaceable>datadir</replaceable> -i <replaceable>backu
14381438
<xref linkend="recovery-target-inclusive"> parameter defines whether the recovery
14391439
target is included into the backup. You can explicitly include or
14401440
exclude the recovery target using the
1441-
<option>--inclusive='<replaceable>boolean</replaceable>'</option> option.
1441+
<option>--inclusive=<replaceable>boolean</replaceable></option> option.
14421442
</para>
14431443
<para>
14441444
To restore the cluster state at the exact time, specify the
@@ -1471,7 +1471,7 @@ pg_probackup restore --xid=687
14711471
tablespaces. For example:
14721472
</para>
14731473
<programlisting>
1474-
pg_probackup restore -D <replaceable>datadir</replaceable> -j 4 -i <replaceable>backup_id</replaceable> -T <replaceable>/tmp/tblspc1</replaceable>=<replaceable>/tmp/tblspc1_new</replaceable> -T <replaceable>/tmp/tblspc2</replaceable>=<replaceable>/tmp/tblspc2_new</replaceable>
1474+
pg_probackup restore -D <replaceable>datadir</replaceable> -j 4 -i <replaceable>backup_id</replaceable> -T <replaceable>/tmp/tablespace1</replaceable>=<replaceable>/tmp/tablespace1_new</replaceable> -T <replaceable>/tmp/tablespace2</replaceable>=<replaceable>/tmp/tablespace2_new</replaceable>
14751475
</programlisting>
14761476
<para>
14771477
Once the <literal>restore</literal> command is complete, start the
@@ -1495,7 +1495,7 @@ pg_probackup restore -D <replaceable>datadir</replaceable> -j 4 -i <replaceable>
14951495
command line option. For example, to create a backup using four parallel threads, run:
14961496
<programlisting>
14971497
pg_probackup backup -b full -j 4
1498-
</programlisting>
1498+
</programlisting>
14991499
</para>
15001500

15011501
<note>
@@ -1517,17 +1517,17 @@ pg_probackup backup -b full -j 4
15171517
<link linkend="pg-probackup-retention-opts">retention options</link> using the
15181518
<xref linkend="pg-probackup-set-config"> command:</para>
15191519
<programlisting>
1520-
pg_probackup set-config -B <replaceable>backupdir</replaceable> [<replaceable>connection-options</replaceable>] [<replaceable>retention-options</replaceable>]
1520+
pg_probackup set-config -B <replaceable>backupdir</replaceable> [<replaceable>connection_options</replaceable>] [<replaceable>retention_options</replaceable>]
15211521
</programlisting>
15221522
<para>where:
15231523
<itemizedlist spacing="compact">
15241524
<listitem>
1525-
<para><replaceable>connection-options</replaceable> are:
1525+
<para><replaceable>connection_options</replaceable> are:
15261526
[-d <replaceable>dbname</replaceable>] [-h <replaceable>host</replaceable>] [-p <replaceable>port</replaceable>] [-U <replaceable>username</replaceable>]
15271527
</para>
15281528
</listitem>
15291529
<listitem>
1530-
<para><replaceable>retention-options</replaceable> are:
1530+
<para><replaceable>retention_options</replaceable> are:
15311531
[--retention-redundancy=<replaceable>redundancy</replaceable>]
15321532
[--retention-window=<replaceable>window</replaceable>]
15331533
</para>
@@ -1564,13 +1564,13 @@ If you define connection parameters in the <filename>pg_probackup.conf</filename
15641564
<itemizedlist spacing="compact">
15651565
<listitem><para>
15661566
<option>retention-redundancy</option> &mdash; specifies the number of full backup
1567-
copies to keep in thedata directory.</para>
1567+
copies to keep in thebackup catalog.</para>
15681568
</listitem>
1569-
<listitem><para><option>retention-window</option> &mdash; defines the earliest point in time for which <application>pg_probackup</application> can complete the recovery. This option is set in the number of days from the current moment. For example, if <option>window</option>=7, <application>pg_probackup</application> must keep at least one full backup copy that is older than seven days, with all the corresponding <acronym>WAL</acronym> files.</para></listitem>
1569+
<listitem><para><option>retention-window</option> &mdash; defines the earliest point in time for which <application>pg_probackup</application> can complete the recovery. This option is set in the number of days from the current moment. For example, if <option>retention-window</option>=7, <application>pg_probackup</application> must keep at least one full backup copy that is older than seven days, with all the corresponding <acronym>WAL</acronym> files.</para></listitem>
15701570
</itemizedlist>
15711571
<para>If both <option>retention-redundancy</option> and <option>retention-window</option>
15721572
options are set, <application>pg_probackup</application> keeps backup copies
1573-
that satisfy both conditions. For example, if you set <option>redundancy</option>=2 and <option>window</option>=7, <application>pg_probackup</application> cleans up the backup directory to keep only two full backup copies if at least one of them is older than seven days.
1573+
that satisfy both conditions. For example, if you set <option>retention-redundancy</option>=2 and <option>retention-window</option>=7, <application>pg_probackup</application> cleans up the backup directory to keep only two full backup copies if at least one of them is older than seven days.
15741574
</para>
15751575
<para>
15761576
To clean up the backup catalog in accordance with retention policy, run:
@@ -1586,7 +1586,7 @@ pg_probackup delete --expired
15861586
Alternatively, you can configure backup retention policy
15871587
and use the <literal>--delete-expired</literal>
15881588
option together with the <literal>backup</literal> command to
1589-
remove the outdated backupcopy once the new backup is created.</para>
1589+
remove the outdated backupcopies once the new backup is created.</para>
15901590
</refsect2>
15911591
</refsect1>
15921592

@@ -1647,7 +1647,7 @@ pg_probackup show
16471647
</para>
16481648
</listitem>
16491649
<listitem>
1650-
<para>Time &mdash; the time it took topeform the backup.
1650+
<para>Time &mdash; the time it took toperform the backup.
16511651
</para>
16521652
</listitem>
16531653
<listitem>
@@ -1675,7 +1675,7 @@ pg_probackup show
16751675
To get more detailed information about the backup, run the <command>show</command> with the backup ID:
16761676
</para>
16771677
<programlisting>
1678-
pg_probackup show -i <replaceable>backup_id</replaceable>
1678+
pg_probackup show -i <replaceable>backup_id</replaceable>
16791679
</programlisting>
16801680
<para>
16811681
The sample output is as follows:
@@ -1710,7 +1710,7 @@ status = OK
17101710
command:
17111711
</para>
17121712
<programlisting>
1713-
pg_probackup delete -ibackup-id
1713+
pg_probackup delete -i<replaceable>backup_id</replaceable>
17141714
</programlisting>
17151715
<para>
17161716
This command will delete the backup with the specified
@@ -1721,9 +1721,10 @@ status = OK
17211721
</para>
17221722
<note>
17231723
<para>
1724-
In this case the next <literal>PTRACK</literal> backup will not be correct as some
1725-
changes since the last retained backup will be lost. Either FULL
1726-
backup or incremental PAGE backup (given that all necessary WAL
1724+
In this case, the next <literal>PTRACK</literal> backup will be incomplete as some
1725+
changes since the last retained backup will be lost. Either a full
1726+
backup or an incremental <literal>PAGE</literal> backup
1727+
(if all the necessary <acronym>WAL</acronym>
17271728
files are still present in the archive) must be taken then.
17281729
</para>
17291730
</note>
@@ -1732,15 +1733,15 @@ status = OK
17321733
of the remaining backups, use the <literal>--wal</literal> option:
17331734
</para>
17341735
<programlisting>
1735-
pg_probackup delete --wal
1736+
pg_probackup delete --wal
17361737
</programlisting>
17371738
<para>
17381739
To delete backups that are expired according to the current
17391740
retention policy, use the
17401741
<literal>--expired</literal> option:
17411742
</para>
17421743
<programlisting>
1743-
pg_probackup delete --expired
1744+
pg_probackup delete --expired
17441745
</programlisting>
17451746
<para>For details, see <xref linkend="pg-probackup-retention-policy">.</para>
17461747
</refsect2>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp