Commitcde2f39

committed

Merge commit '38407a0d44dfd51cc0eb0df25371bf9ac149863e' into PGPRO9_6

Conflicts:contrib/pg_probackup/catalog.ccontrib/pg_probackup/pg_probackup.hcontrib/pg_probackup/restore.c

2 parentsd77b5fc +38407a0 commitcde2f39Copy full SHA for cde2f39

File tree

+3954

-2069

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+3954

-2069

lines changed

Lines changed: 9 additions & 1 deletion

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,11 @@ OBJS = backup.o \`
`19`	`19`	`streamutil.o\`
`20`	`20`	`receivelog.o\`
`21`	`21`	`pgut/pgut.o\`
`22`		`-pgut/pgut-port.o`
	`22`	`+pgut/pgut-port.o\`
	`23`	`+pgut/getopt_long.o`
`23`	`24`
`24`	`25`	`EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c receivelog.c receivelog.h streamutil.c streamutil.h logging.h`
`25`	`26`
`26`		`-REGRESS = init option show delete backup restore`
`27`		`-`
`28`	`27`	`all: checksrcdir datapagemap.h logging.h receivelog.h streamutil.h pg_probackup`
`29`	`28`
`30`	`29`	`MAKE_GLOBAL="../../src/Makefile.global"`
`@@ -54,6 +53,10 @@ PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}`
`54`	`53`	`overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)$(PG_CPPFLAGS)`
`55`	`54`	`PG_LIBS =$(libpq_pgport) ${PTHREAD_CFLAGS}`
`56`	`55`
	`56`	`+ifeq ($(PORTNAME), aix)`
	`57`	`+CC=xlc_r`
	`58`	`+endif`
	`59`	`+`
`57`	`60`	`envtest:`
`58`	`61`	`: top_srcdir=$(top_srcdir)`
`59`	`62`	`: libpq_srcdir =$(libpq_srcdir)`

Lines changed: 22 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,28 @@ All the documentation you can find [here](doc/pg_probackup.md).`
`55`	`55`	`Regression tests`
`56`	`56`	`----------------`
`57`	`57`
`58`		`-The test suite of pg_probackup is available in the code tree and can be`
`59`		`-launched in a way similar to common PostgreSQL extensions and modules:`
	`58`	`+For tests you must have python 2.7 or python 3.3 and higher. Also good idea`
	`59`	+is make virtual enviroment by`virtualenv`.
	`60`	+First of all you need to install`testgres` python module which contains useful
	`61`	`+functions to start postgres clusters and make queries:`
	`62`	`+`
	`63`	+```
	`64`	`+pip install testgres`
	`65`	+```
	`66`	`+`
	`67`	`+To run tests execute:`
	`68`	`+`
	`69`	+```
	`70`	`+python -m unittest tests`
	`71`	+```
	`72`	`+`
	`73`	`+from current (root of project) directory. If you want to run a specific postgres build then`
	`74`	`+you should specify the path to your pg_config executable by setting PG_CONFIG`
	`75`	`+environment variable:`
	`76`	+```
	`77`	`+export PG_CONFIG=/path/to/pg_config`
	`78`	+```
`60`	`79`
`61`		`-make installcheck`
`62`	`80`
`63`	`81`	`Block level incremental backup`
`64`	`82`	`------------------------------`
`@@ -98,6 +116,7 @@ You need to enable WAL archive by adding following lines to postgresql.conf:`
`98`	`116`
`99`	`117`	```
`100`	`118`	`wal_level = archive`
	`119`	`+archive_mode = on`
`101`	`120`	`archive_command = 'test ! -f /home/postgres/backup/wal/%f && cp %p /home/postgres/backup/wal/%f'`
`102`	`121`	```
`103`	`122`

Comments

(0)