Merge remote-tracking branch 'origin/PGPRO11_DEV' into PGPRO11-1121_copy

Author: za-arthur

Makefile

@@ -1,7 +1,7 @@
 PROGRAM = pg_probackup
 OBJS = src/backup.o src/catalog.o src/configure.o src/data.o \
 	src/delete.o src/dir.o src/fetch.o src/help.o src/init.o \
-	src/pg_probackup.o src/restore.o src/show.o src/status.o \
+	src/pg_probackup.o src/restore.o src/show.o \
 	src/util.o src/validate.o src/datapagemap.o src/parsexlog.o \
 	src/xlogreader.o src/streamutil.o src/receivelog.o \
 	src/archive.o src/utils/parray.o src/utils/pgut.o src/utils/logger.o \
@@ -32,7 +32,7 @@ else
 srchome=$(top_srcdir)
 endif
 
-ifneq (,$(filter 10 11 12,$(MAJORVERSION)))
+ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
 OBJS += src/walmethods.o
 EXTRA_CLEAN += src/walmethods.c src/walmethods.h
 INCLUDES += src/walmethods.h
@@ -64,7 +64,7 @@ src/streamutil.h: $(top_srcdir)/src/bin/pg_basebackup/streamutil.h
 	rm -f $@ && $(LN_S) $(srchome)/src/bin/pg_basebackup/streamutil.h $@
 
 
-ifneq (,$(filter 10 11 12,$(MAJORVERSION)))
+ifeq (,$(filter 9.5 9.6,$(MAJORVERSION)))
 src/walmethods.c: $(top_srcdir)/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

README.md

@@ -3,12 +3,12 @@
 `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;
+* PostgreSQL 9.5, 9.6, 10, 11;
 
 `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.5, 9.6
-* Postgres Pro Enterprise
+* Postgres Pro Standard 9.5, 9.6, 10
+* Postgres Pro Enterprise 9.5, 9.6, 10
 
 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:
 * Choosing between full and page-level incremental backups to speed up backup and recovery
@@ -97,4 +97,4 @@ Postgres Professional, Moscow, Russia.
 
 ## Credits
 
-`pg_probackup` utility is based on `pg_arman`, that was originally written by NTT and then developed and maintained by Michael Paquier.
+`pg_probackup` utility is based on `pg_arman`, that was originally written by NTT and then developed and maintained by Michael Paquier.

gen_probackup_project.pl

@@ -127,6 +127,7 @@ sub build_pgprobackup
 	#vvs test
 	my $probackup =
 	  $solution->AddProject('pg_probackup', 'exe', 'pg_probackup'); #, 'contrib/pg_probackup'
+	$probackup->AddDefine('FRONTEND');
 	$probackup->AddFiles(
 		'contrib/pg_probackup/src', 
 		'archive.c',
@@ -139,11 +140,11 @@ sub build_pgprobackup
 		'fetch.c',
 		'help.c',
 		'init.c',
+		'merge.c',
 		'parsexlog.c',
 		'pg_probackup.c',
 		'restore.c',
 		'show.c',
-		'status.c',
 		'util.c',
 		'validate.c'
 		);

src/archive.c

@@ -7,10 +7,10 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #include "pg_probackup.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 
 /*
  * pg_probackup specific archive command for archive backups
@@ -52,7 +52,7 @@ do_archive_push(char *wal_file_path, char *wal_file_name, bool overwrite)
 
 	if(system_id != config->system_identifier)
 		elog(ERROR, "Refuse to push WAL segment %s into archive. Instance parameters mismatch."
-					"Instance '%s' should have SYSTEM_ID = " INT64_FORMAT " instead of " INT64_FORMAT,
+					"Instance '%s' should have SYSTEM_ID = %ld instead of %ld",
 					wal_file_name, instance_name, config->system_identifier, system_id);
 
 	/* Create 'archlog_path' directory. Do nothing if it already exists. */