Merge branch 'master' into issue_146

Author: gsmolk

.gitignore

@@ -47,3 +47,14 @@
 
 # Doc files
 /doc/*html
+
+# Docker files
+/docker-compose.yml
+/Dockerfile
+/Dockerfile.in
+/run_tests.sh
+/make_dockerfile.sh
+/backup_restore.sh
+
+# Misc
+.python-version

.travis.yml

@@ -1,7 +1,47 @@
-sudo: required
+os: linux
+
+dist: bionic
+
+language: c
 
 services:
-- docker
+    - docker
+
+before_install:
+    - cp travis/* .
+
+install:
+    - ./make_dockerfile.sh
+    - docker-compose build
 
 script:
-- docker run -v $(pwd):/tests --rm centos:7 /tests/travis/backup_restore.sh
+    - docker-compose run tests
+    # - docker-compose run $(bash <(curl -s https://codecov.io/env)) tests
+    # - docker run -v $(pwd):/tests --rm centos:7 /tests/travis/backup_restore.sh
+
+notifications:
+    email:
+        on_success: change
+        on_failure: always
+
+# Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
+env:
+    - PG_VERSION=12 PG_BRANCH=REL_12_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=11 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
+
+jobs:
+    allow_failures:
+        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)

Makefile

@@ -15,9 +15,9 @@ OBJS += src/pg_crc.o src/datapagemap.o src/receivelog.o src/streamutil.o \
 
 EXTRA_CLEAN = src/pg_crc.c src/datapagemap.c src/datapagemap.h \
 	src/receivelog.c src/receivelog.h src/streamutil.c src/streamutil.h \
-	src/xlogreader.c
+	src/xlogreader.c src/instr_time.h
 
-INCLUDES = src/datapagemap.h src/streamutil.h src/receivelog.h
+INCLUDES = src/datapagemap.h src/streamutil.h src/receivelog.h src/instr_time.h
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
@@ -60,6 +60,8 @@ all: checksrcdir $(INCLUDES);
 
 $(PROGRAM): $(OBJS)
 
+src/instr_time.h: $(top_srcdir)/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

README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.com/postgrespro/pg_probackup.svg?branch=master)](https://travis-ci.com/postgrespro/pg_probackup)
+
 # pg_probackup
 
 `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.
@@ -7,6 +9,7 @@ The utility is compatible with:
 
 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.
+* Merge: using this feature allows you to implement "incrementally updated backups" strategy, eliminating the need to to do periodical full backups.
 * Validation: automatic data consistency checks and on-demand backup validation without actual data recovery
 * Verification: on-demand verification of PostgreSQL instance with the `checkdb` command.
 * Retention: managing WAL archive and backups in accordance with retention policy. You can configure retention policy based on recovery time or the number of backups to keep, as well as specify `time to live` (TTL) for a particular backup. Expired backups can be merged or deleted.
@@ -37,8 +40,9 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 
 `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)
-* Postgres Pro Standard 9.6, 10, 11
-* Postgres Pro Enterprise 9.6, 10, 11
+* vanilla PostgreSQL 12 with [ptrack extension](https://github.com/postgrespro/ptrack)
+* Postgres Pro Standard 9.6, 10, 11, 12
+* Postgres Pro Enterprise 9.6, 10, 11, 12
 
 ## Limitations