Merge branch 'release_2_5'

Author: kulaginm

.travis.yml

@@ -26,31 +26,35 @@ notifications:
 
 # Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
-    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE
-    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE
-    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE
-    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE
+    - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
+    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
+    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
+    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
     - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=archive
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=backup
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=compression
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=delta
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=locking
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=merge
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=page
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=replica
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=retention
-#    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE MODE=restore
-    - PG_VERSION=15 PG_BRANCH=master
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=archive
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=compression
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=delta
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=locking
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
 
 jobs:
     allow_failures:
         - if: env(PG_BRANCH) = master
+        - if: env(PG_BRANCH) = REL9_5_STABLE
 #        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
 
 # Only run CI for master branch commits to limit our travis usage
 #branches:
 #    only:
 #    - master
+

Makefile

@@ -10,7 +10,7 @@ OBJS = src/utils/configuration.o src/utils/json.o src/utils/logger.o \
 OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o src/data.o \
 	src/delete.o src/dir.o src/fetch.o src/help.o src/init.o src/merge.o \
 	src/parsexlog.o src/ptrack.o src/pg_probackup.o src/restore.o src/show.o src/stream.o \
-	src/util.o src/validate.o src/datapagemap.o
+	src/util.o src/validate.o src/datapagemap.o src/catchup.o
 
 # borrowed files
 OBJS += src/pg_crc.o src/receivelog.o src/streamutil.o \

README.md

@@ -6,7 +6,7 @@
 `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.
 
 The utility is compatible with:
-* PostgreSQL 9.5, 9.6, 10, 11, 12, 13, 14;
+* PostgreSQL 9.6, 10, 11, 12, 13, 14;
 
 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:
 * 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
 
 `PTRACK` backup support provided via following options:
 * vanilla PostgreSQL 11, 12, 13, 14 with [ptrack extension](https://github.com/postgrespro/ptrack)
-* Postgres Pro Standard 9.6, 10, 11, 12, 13
-* Postgres Pro Enterprise 9.6, 10, 11, 12, 13
+* Postgres Pro Standard 11, 12, 13
+* Postgres Pro Enterprise 11, 12, 13
 
 ## Limitations
 
@@ -60,7 +60,7 @@ Documentation can be found at [github](https://postgrespro.github.io/pg_probacku
 
 * Stable version state can be found under the respective [release tag](https://github.com/postgrespro/pg_probackup/releases).
 * `master` branch contains minor fixes that are planned to the nearest minor release.
-* Upcoming major release is developed in a release branch i.e. `release_2_5`.
+* Upcoming major release is developed in a release branch i.e. `release_2_6`.
 
 For detailed release plans check [Milestones](https://github.com/postgrespro/pg_probackup/milestones)
 
@@ -74,71 +74,71 @@ Installers are available in release **assets**. [Latests](https://github.com/pos
 #DEB Ubuntu|Debian Packages
 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'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}
-sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}-dbg
+sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}
+sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}-dbg
 
 #DEB-SRC Packages
 sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
   /etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
-sudo apt-get source pg-probackup-{13,12,11,10,9.6,9.5}
+sudo apt-get source pg-probackup-{14,13,12,11,10,9.6}
 
 #DEB Astra Linix Orel
 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'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{13,12,11,10,9.6,9.5}{-dbg,}
+sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}{-dbg,}
 
 #RPM Centos Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
-yum install pg_probackup-{13,12,11,10,9.6,9.5}
-yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+yum install pg_probackup-{14,13,12,11,10,9.6}
+yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #RPM RHEL Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
-yum install pg_probackup-{13,12,11,10,9.6,9.5}
-yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+yum install pg_probackup-{14,13,12,11,10,9.6}
+yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #RPM Oracle Linux Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
-yum install pg_probackup-{13,12,11,10,9.6,9.5}
-yum install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+yum install pg_probackup-{14,13,12,11,10,9.6}
+yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #SRPM Centos|RHEL|OracleLinux Packages
-yumdownloader --source pg_probackup-{13,12,11,10,9.6,9.5}
+yumdownloader --source pg_probackup-{14,13,12,11,10,9.6}
 
 #RPM SUSE|SLES Packages
 zypper install --allow-unsigned-rpm -y https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-suse.noarch.rpm
-zypper --gpg-auto-import-keys install -y pg_probackup-{13,12,11,10,9.6,9.5}
-zypper install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+zypper --gpg-auto-import-keys install -y pg_probackup-{14,13,12,11,10,9.6}
+zypper install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #SRPM SUSE|SLES Packages
-zypper si pg_probackup-{13,12,11,10,9.6,9.5}
+zypper si pg_probackup-{14,13,12,11,10,9.6}
 
 #RPM ALT Linux 7
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #RPM ALT Linux 8
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 
 #RPM ALT Linux 9
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{13,12,11,10,9.6,9.5}-debuginfo
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
 ```
 
 #### pg_probackup for PostgresPro Standard and Enterprise
 ```shell
 #DEB Ubuntu|Debian Packages
 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'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}
-sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}-dbg
+sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}
+sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}-dbg
 
 #DEB Astra Linix Orel
 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,}
 
 #RPM Centos Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 
 #RPM RHEL Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 
 #RPM Oracle Linux Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}
-yum install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 
 #RPM ALT Linux 7
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 
 #RPM ALT Linux 8
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 
 #RPM ALT Linux 9
 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
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}
-sudo apt-get install pg_probackup-{std,ent}-{12,11,10,9.6}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
+sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
 ```
 
 Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.github.io/pg_probackup/#pbk-install-and-setup).