Skip to content

Commit a0dc029

Browse files
committed
Merge branch 'master' into issue_90
2 parents 3a0046e + 4edc414 commit a0dc029

Some content is hidden

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

52 files changed

+4806
-1645
lines changed

Documentation.md

Lines changed: 901 additions & 703 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
3333
* `Autonomous backups` streams via replication protocol all the WAL files required to restore the cluster to a consistent state at the time the backup was taken. Even if continuous archiving is not set up, the required WAL segments are included into the backup.
3434
* `Archive backups` rely on continuous archiving.
3535

36+
## ptrack support
37+
3638
`PTRACK` backup support provided via following options:
3739
* vanilla PostgreSQL compiled with ptrack patch. Currently there are patches for [PostgreSQL 9.6](https://gist.githubusercontent.com/gsmol/5b615c971dfd461c76ef41a118ff4d97/raw/e471251983f14e980041f43bea7709b8246f4178/ptrack_9.6.6_v1.5.patch) and [PostgreSQL 10](https://gist.githubusercontent.com/gsmol/be8ee2a132b88463821021fd910d960e/raw/de24f9499f4f314a4a3e5fae5ed4edb945964df8/ptrack_10.1_v1.5.patch)
3840
* Postgres Pro Standard 9.5, 9.6, 10, 11
@@ -45,22 +47,26 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
4547
* Remote mode is in beta stage.
4648
* Incremental chain can span only within one timeline. So if you have backup incremental chain taken from replica and it gets promoted, you would be forced to take another FULL backup.
4749

50+
## Current release
51+
52+
[2.1.5](https://github.com/postgrespro/pg_probackup/releases/tag/2.1.5)
53+
4854
## Installation and Setup
4955
### Windows Installation
50-
[Installers download link](https://oc.postgrespro.ru/index.php/s/CGsjXlc5NmhRI0L)
56+
Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/tag/2.1.5).
5157

5258
### Linux Installation
5359
```shell
5460
#DEB Ubuntu|Debian Packages
55-
echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
56-
wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | apt-key add - && apt-get update
57-
apt-get install pg-probackup-{11,10,9.6,9.5}
58-
apt-get install pg-probackup-{11,10,9.6,9.5}-dbg
61+
sudo echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
62+
sudo wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
63+
sudo apt-get install pg-probackup-{11,10,9.6,9.5}
64+
sudo apt-get install pg-probackup-{11,10,9.6,9.5}-dbg
5965

6066
#DEB-SRC Packages
61-
echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
67+
sudo echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
6268
/etc/apt/sources.list.d/pg_probackup.list
63-
apt-get source pg-probackup-{11,10,9.6,9.5}
69+
sudo apt-get source pg-probackup-{11,10,9.6,9.5}
6470

6571
#RPM Centos Packages
6672
rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
@@ -81,7 +87,7 @@ yum install pg_probackup-{11,10,9.6,9.5}-debuginfo
8187
yumdownloader --source pg_probackup-{11,10,9.6,9.5}
8288
```
8389

84-
Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.com/docs/postgrespro/current/app-pgprobackup.html#pg-probackup-install-and-setup).
90+
Once you have `pg_probackup` installed, complete [the setup](https://github.com/postgrespro/pg_probackup/blob/master/Documentation.md#installation-and-setup).
8591

8692
## Building from source
8793
### Linux
@@ -104,17 +110,14 @@ SET PATH=%PATH%;C:\msys64\usr\bin
104110
gen_probackup_project.pl C:\path_to_postgresql_source_tree
105111
```
106112

107-
## Current release
108-
109-
[2.1.3](https://github.com/postgrespro/pg_probackup/releases/tag/2.1.3)
110-
111113
## Documentation
112114

113-
Currently the latest documentation can be found at [github](https://github.com/postgrespro/pg_probackup/blob/master/Documentation.md) and [Postgres Pro Enterprise documentation](https://postgrespro.com/docs/postgrespro/current/app-pgprobackup).
115+
Currently the latest documentation can be found at [github](https://postgrespro.github.io/pg_probackup).
116+
Slightly outdated documentation can be found at [Postgres Pro Enterprise documentation](https://postgrespro.com/docs/postgrespro/current/app-pgprobackup).
114117

115-
## Licence
118+
## License
116119

117-
This module available under the [license](LICENSE) similar to [PostgreSQL](https://www.postgresql.org/about/licence/).
120+
This module available under the [license](LICENSE) similar to [PostgreSQL](https://www.postgresql.org/about/license/).
118121

119122
## Feedback
120123

doit.cmd

Lines changed: 0 additions & 3 deletions
This file was deleted.

doit96.cmd

Lines changed: 0 additions & 1 deletion
This file was deleted.

gen_probackup_project.pl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
our $currpath;
66

77
BEGIN {
8-
# path to the pg_pprobackup dir
8+
# path to the pg_probackup dir
99
$currpath = File::Basename::dirname(Cwd::abs_path($0));
1010
use Cwd;
1111
use File::Basename;
@@ -155,7 +155,8 @@ sub build_pgprobackup
155155
'restore.c',
156156
'show.c',
157157
'util.c',
158-
'validate.c'
158+
'validate.c',
159+
'checkdb.c'
159160
);
160161
$probackup->AddFiles(
161162
"$currpath/src/utils",
@@ -166,7 +167,8 @@ sub build_pgprobackup
166167
'logger.c',
167168
'parray.c',
168169
'pgut.c',
169-
'thread.c'
170+
'thread.c',
171+
'remote.c'
170172
);
171173
$probackup->AddFile("$pgsrc/src/backend/access/transam/xlogreader.c");
172174
$probackup->AddFile("$pgsrc/src/backend/utils/hash/pg_crc.c");

0 commit comments

Comments
 (0)