Merge branch 'PGPRO10' into PGPROEE10_MULTIMASTER

Author: vbwagner

contrib/pg_probackup/README.md

@@ -6,7 +6,7 @@ The utility is compatible with:
 * PostgreSQL 9.5, 9.6, 10;
 
 `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/3d9ad9ea2568e0f4aaeeda62b59e30f8/raw/8f28e207c1aa172a9597fcda49e69b086c6b42bd/ptrack_9.6.5_v1.3.patch) and [PostgreSQL 10](https://gist.githubusercontent.com/gsmol/0ce69df847268333b72d72079bd48315/raw/d35d49c28446637ea3fe9dfc1a400bb298bf3318/ptrack_10.0_v1.3.patch)
+* 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)
 * Postgres Pro Standard 9.5, 9.6
 * Postgres Pro Enterprise
 
@@ -27,6 +27,7 @@ Using `pg_probackup`, you can take full or incremental backups:
 * `Full` backups contain all the data files required to restore the database cluster from scratch.
 * `Incremental` backups only store the data that has changed since the previous backup. It allows to decrease the backup size and speed up backup operations. `pg_probackup` supports the following modes of incremental backups:
   * `PAGE` backup. In this mode, `pg_probackup` scans all WAL files in the archive from the moment the previous full or incremental backup was taken. Newly created backups contain only the pages that were mentioned in WAL records. This requires all the WAL files since the previous backup to be present in the WAL archive. If the size of these files is comparable to the total size of the database cluster files, speedup is smaller, but the backup still takes less space.
+  * `DELTA` backup. In this mode, `pg_probackup` read all data files in PGDATA directory and only those pages, that where changed since previous backup, are copied. Continuous archiving is not necessary for it to operate. Also this mode could impose read-only I/O pressure equal to `Full` backup.
   * `PTRACK` backup. In this mode, PostgreSQL tracks page changes on the fly. Continuous archiving is not necessary for it to operate. Each time a relation page is updated, this page is marked in a special `PTRACK` bitmap for this relation. As one page requires just one bit in the `PTRACK` fork, such bitmaps are quite small. Tracking implies some minor overhead on the database server operation, but speeds up incremental backups significantly.
 
 Regardless of the chosen backup type, all backups taken with `pg_probackup` support the following archiving strategies:
@@ -47,18 +48,27 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 #DEB Ubuntu|Debian Packages
 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
 wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | apt-key add - && apt-get update
-apt-get install pg-probackup-(10|9.6|9.5)
+apt-get install pg-probackup-{10,9.6,9.5}
 
 #DEB-SRC Packages
 echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
   /etc/apt/sources.list.d/pg_probackup.list
+apt-get source pg-probackup-{10,9.6,9.5}
 
 #RPM Centos Packages
 rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
-yum install pg_probackup-(10|9.6|9.5)
+yum install pg_probackup-{10,9.6,9.5}
 
-#SRPM Centos Packages
-yumdownloader --source pg_probackup-(10|9.6|9.5)
+#RPM RHEL Packages
+rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
+yum install pg_probackup-{10,9.6,9.5}
+
+#RPM Oracle Linux Packages
+rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
+yum install pg_probackup-{10,9.6,9.5}
+
+#SRPM Packages
+yumdownloader --source pg_probackup-{10,9.6,9.5}
 ```
 
 To compile `pg_probackup`, you must have a PostgreSQL installation and raw source tree. To install `pg_probackup`, execute this in the module's directory: