Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 92128e9

Browse files
kulaginmkulaginm
committed
Merge branch 'release_2_5'
2 parents 66dd4b2 + 474a956 commit 92128e9

Some content is hidden

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

55 files changed

+6821
-3263
lines changed

‎.travis.yml

+19-15
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,35 @@ notifications:
2626

2727
# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
2828
env:
29-
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE
30-
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE
31-
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE
32-
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE
29+
- PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
30+
- PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
31+
- PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
32+
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
33+
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
3334
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
3435
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
3536
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
36-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
37-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
38-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
39-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=delta
40-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=locking
41-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=merge
42-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=page
43-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=replica
44-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=retention
45-
# - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
46-
- PG_VERSION=15 PG_BRANCH=master
37+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive
38+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
39+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
40+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression
41+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta
42+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking
43+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
44+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page
45+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
46+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
47+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention
48+
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
4749

4850
jobs:
4951
allow_failures:
5052
- if: env(PG_BRANCH) = master
53+
- if: env(PG_BRANCH) = REL9_5_STABLE
5154
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
5255

5356
# Only run CI for master branch commits to limit our travis usage
5457
#branches:
5558
# only:
5659
# - master
60+

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
1010
OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o src/data.o \
1111
src/delete.o src/dir.o src/fetch.o src/help.o src/init.o src/merge.o \
1212
src/parsexlog.o src/ptrack.o src/pg_probackup.o src/restore.o src/show.o src/stream.o \
13-
src/util.o src/validate.o src/datapagemap.o
13+
src/util.o src/validate.o src/datapagemap.o src/catchup.o
1414

1515
# borrowed files
1616
OBJS += src/pg_crc.o src/receivelog.o src/streamutil.o \

‎README.md

+38-38
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
`pg_probackup` is a utility to manage backup and recovery of PostgreSQL database clusters. It is designed to perform periodic backups of the PostgreSQL instance that enable you to restore the server in case of a failure.
77

88
The utility is compatible with:
9-
* PostgreSQL 9.5, 9.6, 10, 11, 12, 13, 14;
9+
* PostgreSQL 9.6, 10, 11, 12, 13, 14;
1010

1111
As compared to other backup solutions, `pg_probackup` offers the following benefits that can help you implement different backup strategies and deal with large amounts of data:
1212
* Incremental backup: page-level incremental backup allows you to save disk space, speed up backup and restore. With three different incremental modes, you can plan the backup strategy in accordance with your data flow.
@@ -42,8 +42,8 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
4242

4343
`PTRACK` backup support provided via following options:
4444
* vanilla PostgreSQL 11, 12, 13, 14 with [ptrack extension](https://github.com/postgrespro/ptrack)
45-
* Postgres Pro Standard 9.6, 10, 11, 12, 13
46-
* Postgres Pro Enterprise 9.6, 10, 11, 12, 13
45+
* Postgres Pro Standard 11, 12, 13
46+
* Postgres Pro Enterprise 11, 12, 13
4747

4848
## Limitations
4949

@@ -60,7 +60,7 @@ Documentation can be found at [github](https://postgrespro.github.io/pg_probacku
6060

6161
* Stable version state can be found under the respective [release tag](https://github.com/postgrespro/pg_probackup/releases).
6262
* `master` branch contains minor fixes that are planned to the nearest minor release.
63-
* Upcoming major release is developed in a release branch i.e. `release_2_5`.
63+
* Upcoming major release is developed in a release branch i.e. `release_2_6`.
6464

6565
For detailed release plans check [Milestones](https://github.com/postgrespro/pg_probackup/milestones)
6666

@@ -74,71 +74,71 @@ Installers are available in release **assets**. [Latests](https://github.com/pos
7474
#DEB Ubuntu|Debian Packages
7575
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list'
7676
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
77-
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}
78-
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}-dbg
77+
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}
78+
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}-dbg
7979

8080
#DEB-SRC Packages
8181
sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
8282
/etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
83-
sudo apt-get source pg-probackup-{13,12,11,10,9.6,9.5}
83+
sudo apt-get source pg-probackup-{14,13,12,11,10,9.6}
8484

8585
#DEB Astra Linix Orel
8686
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
8787
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
88-
sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}{-dbg,}
88+
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}{-dbg,}
8989

9090
#RPM Centos Packages
9191
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
92-
yum install pg_probackup-{13,12,11,10,9.6,9.5}
93-
yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
92+
yum install pg_probackup-{14,13,12,11,10,9.6}
93+
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
9494

9595
#RPM RHEL Packages
9696
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
97-
yum install pg_probackup-{13,12,11,10,9.6,9.5}
98-
yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
97+
yum install pg_probackup-{14,13,12,11,10,9.6}
98+
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
9999

100100
#RPM Oracle Linux Packages
101101
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
102-
yum install pg_probackup-{13,12,11,10,9.6,9.5}
103-
yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
102+
yum install pg_probackup-{14,13,12,11,10,9.6}
103+
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
104104

105105
#SRPM Centos|RHEL|OracleLinux Packages
106-
yumdownloader --source pg_probackup-{13,12,11,10,9.6,9.5}
106+
yumdownloader --source pg_probackup-{14,13,12,11,10,9.6}
107107

108108
#RPM SUSE|SLES Packages
109109
zypper install --allow-unsigned-rpm -y https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-suse.noarch.rpm
110-
zypper --gpg-auto-import-keys install -y pg_probackup-{13,12,11,10,9.6,9.5}
111-
zypper install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
110+
zypper --gpg-auto-import-keys install -y pg_probackup-{14,13,12,11,10,9.6}
111+
zypper install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
112112

113113
#SRPM SUSE|SLES Packages
114-
zypper si pg_probackup-{13,12,11,10,9.6,9.5}
114+
zypper si pg_probackup-{14,13,12,11,10,9.6}
115115

116116
#RPM ALT Linux 7
117117
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p7 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
118118
sudo apt-get update
119-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
120-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
119+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
120+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
121121

122122
#RPM ALT Linux 8
123123
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
124124
sudo apt-get update
125-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
126-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
125+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
126+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
127127

128128
#RPM ALT Linux 9
129129
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
130130
sudo apt-get update
131-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
132-
sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
131+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
132+
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
133133
```
134134

135135
#### pg_probackup for PostgresPro Standard and Enterprise
136136
```shell
137137
#DEB Ubuntu|Debian Packages
138138
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list'
139139
sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
140-
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}
141-
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}-dbg
140+
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}
141+
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}-dbg
142142

143143
#DEB Astra Linix Orel
144144
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
@@ -148,35 +148,35 @@ sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}{-dbg,}
148148

149149
#RPM Centos Packages
150150
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
151-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
152-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
151+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
152+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
153153

154154
#RPM RHEL Packages
155155
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
156-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
157-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
156+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
157+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
158158

159159
#RPM Oracle Linux Packages
160160
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
161-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}
162-
yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
161+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
162+
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
163163

164164
#RPM ALT Linux 7
165165
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
166166
sudo apt-get update
167-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
168-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
167+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
168+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
169169

170170
#RPM ALT Linux 8
171171
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
172172
sudo apt-get update
173-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
174-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
173+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
174+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
175175

176176
#RPM ALT Linux 9
177177
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list' && sudo apt-get update
178-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
179-
sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
178+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
179+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
180180
```
181181

182182
Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.github.io/pg_probackup/#pbk-install-and-setup).

0 commit comments

Comments
 (0)