Merge branch 'master' into release_2_5

Author: gsmolk

.gitignore

@@ -34,9 +34,6 @@
 
 # Extra files
 /src/pg_crc.c
-/src/datapagemap.c
-/src/datapagemap.h
-/src/logging.h
 /src/receivelog.c
 /src/receivelog.h
 /src/streamutil.c
@@ -59,3 +56,4 @@
 
 # Misc
 .python-version
+.vscode

Makefile

@@ -7,102 +7,76 @@ 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/util.o \
-	src/validate.o
+	src/validate.o src/datapagemap.o
 
 # borrowed files
-OBJS += src/pg_crc.o src/datapagemap.o src/receivelog.o src/streamutil.o \
+OBJS += src/pg_crc.o src/receivelog.o src/streamutil.o \
 	src/xlogreader.o
 
-EXTRA_CLEAN = src/pg_crc.c src/datapagemap.c src/datapagemap.h \
+EXTRA_CLEAN = src/pg_crc.c \
 	src/receivelog.c src/receivelog.h src/streamutil.c src/streamutil.h \
 	src/xlogreader.c src/instr_time.h
 
-INCLUDES = src/datapagemap.h src/streamutil.h src/receivelog.h src/instr_time.h
+ifdef top_srcdir
+srchome := $(abspath $(top_srcdir))
+else
+top_srcdir=../..
+ifneq (,$(wildcard ../../../contrib/pg_probackup))
+# separate build directory support
+srchome := $(abspath $(top_srcdir)/..)
+else
+srchome := $(abspath $(top_srcdir))
+endif
+endif
+
+# OBJS variable must be finally defined before invoking the include directive
+ifneq (,$(wildcard $(srchome)/src/bin/pg_basebackup/walmethods.c))
+OBJS += src/walmethods.o
+EXTRA_CLEAN += src/walmethods.c src/walmethods.h
+endif
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-# !USE_PGXS
 else
 subdir=contrib/pg_probackup
 top_builddir=../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
-endif # USE_PGXS
-
-ifeq ($(top_srcdir),../..)
- ifeq ($(LN_S),ln -s)
-	srchome=$(top_srcdir)/..
- endif
-else
-srchome=$(top_srcdir)
-endif
-
-#ifneq (,$(filter 9.5 9.6 10 11,$(MAJORVERSION)))
-ifneq (12,$(MAJORVERSION))
-EXTRA_CLEAN += src/logging.h
-INCLUDES += src/logging.h
-endif
-
-ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
-OBJS += src/walmethods.o
-EXTRA_CLEAN += src/walmethods.c src/walmethods.h
-INCLUDES += src/walmethods.h
 endif
 
-
-PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -Isrc -I$(top_srcdir)/$(subdir)/src
+PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -Isrc -I$(srchome)/$(subdir)/src
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS) $(PG_CPPFLAGS)
 PG_LIBS_INTERNAL = $(libpq_pgport) ${PTHREAD_CFLAGS}
 
-all: checksrcdir $(INCLUDES);
+src/utils/configuration.o: src/datapagemap.h
+src/archive.o: src/instr_time.h
+src/backup.o: src/receivelog.h src/streamutil.h
 
-$(PROGRAM): $(OBJS)
-
-src/instr_time.h: $(top_srcdir)/src/include/portability/instr_time.h
+src/instr_time.h: $(srchome)/src/include/portability/instr_time.h
 	rm -f $@ && $(LN_S) $(srchome)/src/include/portability/instr_time.h $@
-src/datapagemap.c: $(top_srcdir)/src/bin/pg_rewind/datapagemap.c
-	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_rewind/datapagemap.c $@
-src/datapagemap.h: $(top_srcdir)/src/bin/pg_rewind/datapagemap.h
-	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_rewind/datapagemap.h $@
-src/pg_crc.c: $(top_srcdir)/src/backend/utils/hash/pg_crc.c
+src/pg_crc.c: $(srchome)/src/backend/utils/hash/pg_crc.c
 	rm -f $@ && $(LN_S) $(srchome)/src/backend/utils/hash/pg_crc.c $@
-src/receivelog.c: $(top_srcdir)/src/bin/pg_basebackup/receivelog.c
+src/receivelog.c: $(srchome)/src/bin/pg_basebackup/receivelog.c
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/receivelog.c $@
-src/receivelog.h: $(top_srcdir)/src/bin/pg_basebackup/receivelog.h
+ifneq (,$(wildcard $(srchome)/src/bin/pg_basebackup/walmethods.c))
+src/receivelog.h: src/walmethods.h $(srchome)/src/bin/pg_basebackup/receivelog.h
+else
+src/receivelog.h: $(srchome)/src/bin/pg_basebackup/receivelog.h
+endif
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/receivelog.h $@
-src/streamutil.c: $(top_srcdir)/src/bin/pg_basebackup/streamutil.c
+src/streamutil.c: $(srchome)/src/bin/pg_basebackup/streamutil.c
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/streamutil.c $@
-src/streamutil.h: $(top_srcdir)/src/bin/pg_basebackup/streamutil.h
+src/streamutil.h: $(srchome)/src/bin/pg_basebackup/streamutil.h
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/streamutil.h $@
-src/xlogreader.c: $(top_srcdir)/src/backend/access/transam/xlogreader.c
+src/xlogreader.c: $(srchome)/src/backend/access/transam/xlogreader.c
 	rm -f $@ && $(LN_S) $(srchome)/src/backend/access/transam/xlogreader.c $@
-
-#ifneq (,$(filter 9.5 9.6 10 11,$(MAJORVERSION)))
-ifneq (12,$(MAJORVERSION))
-src/logging.h: $(top_srcdir)/src/bin/pg_rewind/logging.h
-	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_rewind/logging.h $@
-endif
-
-ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
-src/walmethods.c: $(top_srcdir)/src/bin/pg_basebackup/walmethods.c
+src/walmethods.c: $(srchome)/src/bin/pg_basebackup/walmethods.c
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/walmethods.c $@
-src/walmethods.h: $(top_srcdir)/src/bin/pg_basebackup/walmethods.h
+src/walmethods.h: $(srchome)/src/bin/pg_basebackup/walmethods.h
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/walmethods.h $@
-endif
 
 ifeq ($(PORTNAME), aix)
 	CC=xlc_r
 endif
-
-# This rule's only purpose is to give the user instructions on how to pass
-# the path to PostgreSQL source tree to the makefile.
-.PHONY: checksrcdir
-checksrcdir:
-ifndef top_srcdir
-	@echo "You must have PostgreSQL source tree available to compile."
-	@echo "Pass the path to the PostgreSQL source tree to make, in the top_srcdir"
-	@echo "variable: \"make top_srcdir=<path to PostgreSQL source tree>\""
-	@exit 1
-endif

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;
+* PostgreSQL 9.5, 9.6, 10, 11, 12, 13;
 
 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.
@@ -41,8 +41,7 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 ## ptrack support
 
 `PTRACK` backup support provided via following options:
-* 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)
-* vanilla PostgreSQL 12 with [ptrack extension](https://github.com/postgrespro/ptrack)
+* vanilla PostgreSQL 12,13 with [ptrack extension](https://github.com/postgrespro/ptrack)
 * Postgres Pro Standard 9.6, 10, 11, 12
 * Postgres Pro Enterprise 9.6, 10, 11, 12
 
@@ -59,65 +58,65 @@ Documentation can be found at [github](https://postgrespro.github.io/pg_probacku
 
 ## Installation and Setup
 ### Windows Installation
-Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.4.1).
+Installers are available in release **assets**. [Latests](https://github.com/postgrespro/pg_probackup/releases/2.4.4).
 
 ### Linux Installation
 #### pg_probackup for vanilla PostgreSQL
 ```shell
 #DEB Ubuntu|Debian Packages
 sudo 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-{12,11,10,9.6,9.5}
-sudo apt-get install pg-probackup-{12,11,10,9.6,9.5}-dbg
+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
 
 #DEB-SRC Packages
 sudo 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-{12,11,10,9.6,9.5}
+sudo apt-get source pg-probackup-{13,12,11,10,9.6,9.5}
 
 #RPM Centos Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
-yum install pg_probackup-{12,11,10,9.6,9.5}
-yum install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #RPM RHEL Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
-yum install pg_probackup-{12,11,10,9.6,9.5}
-yum install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #RPM Oracle Linux Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
-yum install pg_probackup-{12,11,10,9.6,9.5}
-yum install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #SRPM Centos|RHEL|OracleLinux Packages
-yumdownloader --source pg_probackup-{12,11,10,9.6,9.5}
+yumdownloader --source pg_probackup-{13,12,11,10,9.6,9.5}
 
 #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-{12,11,10,9.6,9.5}
-zypper install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #SRPM SUSE|SLES Packages
-zypper si pg_probackup-{12,11,10,9.6,9.5}
+zypper si pg_probackup-{13,12,11,10,9.6,9.5}
 
 #RPM ALT Linux 7
 sudo 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-{12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #RPM ALT Linux 8
 sudo 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-{12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 
 #RPM ALT Linux 9
 sudo 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-{12,11,10,9.6,9.5}
-sudo apt-get install pg_probackup-{12,11,10,9.6,9.5}-debuginfo
+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
 ```
 
 #### pg_probackup for PostgresPro Standard and Enterprise

doc/pgprobackup.xml

@@ -399,7 +399,7 @@ doc/src/sgml/pgprobackup.sgml
       </listitem>
       <listitem>
         <para>
-          On Unix systems, for <productname>PostgreSQL</productname> 10 or higher,
+          On Unix systems, for <productname>PostgreSQL</productname> 10 or lower,
           a backup can be made only by the same OS user that has started the <productname>PostgreSQL</productname>
           server. For example, if <productname>PostgreSQL</productname> server is started by
           user <literal>postgres</literal>, the <literal>backup</literal> command must also be run
@@ -1161,14 +1161,22 @@ GRANT SELECT ON TABLE pg_catalog.pg_database TO backup;
       PostgreSQL. Links to PTRACK patches can be found
       <ulink url="https://github.com/postgrespro/pg_probackup#ptrack-support">here</ulink>.
     </para>
+    <note>
+     <para>
+      PTRACK versions lower than 2.0 are deprecated. Postgres Pro Standard and Postgres Pro Enterprise
+      versions starting with 11.9.1 contain PTRACK 2.0. Upgrade your server to avoid issues in backups
+      that you will take in future and be sure to take fresh backups of your clusters with the upgraded
+      PTRACK since the backups taken with PTRACK 1.x might be corrupt.
+     </para>
+    </note>
     <para>
       If you are going to use PTRACK backups, complete the following
       additional steps. The role that will perform PTRACK backups
       (the <literal>backup</literal> role in the examples below) must have
       access to all the databases of the cluster.
     </para>
     <para>
-    For <productname>PostgreSQL</productname> 12 or higher:
+    For <productname>PostgreSQL</productname> 11 or higher:
     </para>
     <orderedlist>
      <listitem>
@@ -1226,7 +1234,7 @@ GRANT EXECUTE ON FUNCTION pg_ptrack_get_block(oid, oid, oid, bigint) TO backup;
      For older <productname>PostgreSQL</productname> versions,
      PTRACK required taking backups in the exclusive mode
      to provide exclusive access to bitmaps with changed blocks.
-     To set up PTRACK backups for <productname>PostgreSQL</productname> 11
+     To set up PTRACK backups for <productname>PostgreSQL</productname> 10
      or lower, do the following:
     </para>
     <orderedlist>