From 6650d8144cba46f93ad75c11ad98d87c57d2ea7f Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 25 Jun 2019 08:29:06 -0400 Subject: [PATCH] v2.15: C Implementation of Expire MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug Fixes: * Fix archive retention expiring too aggressively. (Fixed by Cynthia Shang. Reported by Mohamad El-Rifai.) Improvements: * The expire command is implemented entirely in C. (Contributed by Cynthia Shang.) * The local command for restore is implemented entirely in C. * Remove hard-coded PostgreSQL user so $PGUSER works. (Suggested by Julian Zhang, Janis Puris.) * Honor configure --prefix option. (Suggested by Daniel Westermann.) * Rename repo-s3-verify-ssl option to repo-s3-verify-tls. The new name is preferred because pgBackRest does not support any SSL protocol versions (they are all considered to be insecure). The old name will continue to be accepted. Documentation Improvements: * Add FAQ to the documentation. (Contributed by Cynthia Shang.) * Use wal_level=replica in the documentation for PostgreSQL ≥ 9.6. (Suggested by Patrick McLaughlin.) --- README.md | 2 +- doc/resource/exe.cache | 1823 +++++++++--------- doc/resource/git-history.cache | 441 +++++ doc/xml/auto/metric-coverage-report.auto.xml | 125 +- doc/xml/release.xml | 2 +- lib/pgBackRest/Version.pm | 2 +- src/configure | 18 +- src/configure.ac | 2 +- src/perl/embed.auto.c | 2 +- src/version.h | 2 +- test/code-count/file-type.yaml | 92 +- 11 files changed, 1498 insertions(+), 1013 deletions(-) diff --git a/README.md b/README.md index 0862609a3..063d470cf 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ pgBackRest aims to be a simple, reliable backup and restore solution that can seamlessly scale up to the largest databases and workloads by utilizing algorithms that are optimized for database-specific requirements. -pgBackRest [v2.14](https://github.com/pgbackrest/pgbackrest/releases/tag/release/2.14) is the current stable release. Release notes are on the [Releases](http://www.pgbackrest.org/release.html) page. +pgBackRest [v2.15](https://github.com/pgbackrest/pgbackrest/releases/tag/release/2.15) is the current stable release. Release notes are on the [Releases](http://www.pgbackrest.org/release.html) page. Documentation for v1 can be found [here](http://www.pgbackrest.org/1). No further releases are planned for v1 because v2 is backward-compatible with v1 options and repositories. diff --git a/doc/resource/exe.cache b/doc/resource/exe.cache index 5d8b49bc9..6971e2d7d 100644 --- a/doc/resource/exe.cache +++ b/doc/resource/exe.cache @@ -2,6 +2,21 @@ "default" : { "all" : { "user-guide" : [ + { + "key" : { + "id" : "s3", + "image" : "minio/minio:RELEASE.2019-06-04T01-15-58Z", + "name" : "s3-server", + "option" : "-v {[host-repo-path]}/doc/resource/fake-cert/s3-server.crt:/root/.minio/certs/public.crt:ro -v {[host-repo-path]}/doc/resource/fake-cert/s3-server.key:/root/.minio/certs/private.key:ro -e MINIO_REGION=us-east-1 -e MINIO_DOMAIN=s3.us-east-1.amazonaws.com -e MINIO_BROWSER=off -e MINIO_ACCESS_KEY=accessKey1 -e MINIO_SECRET_KEY=verySecretKey1", + "os" : "debian", + "param" : "server /data --address :443 --compat", + "update-hosts" : false + }, + "type" : "host", + "value" : { + "ip" : "172.17.0.2" + } + }, { "key" : { "id" : "build", @@ -13,14 +28,14 @@ }, "type" : "host", "value" : { - "ip" : "172.17.0.2" + "ip" : "172.17.0.3" } }, { "key" : { "bash-wrap" : true, "cmd" : [ - "sudo mkdir /root/pgbackrest-release-2.14" + "sudo mkdir /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -33,7 +48,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -46,7 +61,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -104,7 +119,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "(cd /root/pgbackrest-release-2.14/src && ./configure)" + "(cd /root/pgbackrest-release-2.15/src && ./configure)" ], "host" : "build", "load-env" : true, @@ -117,7 +132,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo make -s -C /root/pgbackrest-release-2.14/src" + "sudo make -s -C /root/pgbackrest-release-2.15/src" ], "host" : "build", "load-env" : true, @@ -126,19 +141,6 @@ }, "type" : "exe" }, - { - "key" : { - "id" : "s3", - "image" : "pgbackrest/test:s3-server-20180612A", - "name" : "s3-server", - "os" : "debian", - "update-hosts" : true - }, - "type" : "host", - "value" : { - "ip" : "172.17.0.3" - } - }, { "key" : { "id" : "pg1", @@ -157,7 +159,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-primary", @@ -299,7 +301,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - General help", + "pgBackRest 2.15 - General help", "", "Usage:", " pgbackrest [options] [command]", @@ -444,7 +446,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - 'backup' command - 'log-path' option help", + "pgBackRest 2.15 - 'backup' command - 'log-path' option help", "", "Path where log files are stored.", "", @@ -533,7 +535,7 @@ "value" : "3" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -545,7 +547,7 @@ "listen_addresses = '*'", "log_line_prefix = ''", "max_wal_senders = 3", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -681,7 +683,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -707,8 +709,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", - "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/10-1/0000000100000000/000000010000000000000001-e21292f18998a5bf530db74219310a4ec31b95c1.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/10-1/0000000100000000/000000010000000000000001-b32bd89933278fbcbdc4b6204ee15a31c1197ca6.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -735,9 +737,9 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:18:25\": backup begins after the next regular checkpoint completes", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 02:01:57\": backup begins after the next regular checkpoint completes", "P00 INFO: backup start archive = 000000010000000000000002, lsn = 0/2000028", " [filtered 941 lines of output]", "P01 INFO: backup file /var/lib/postgresql/10/demo/base/1/12820 (0B, 100%)", @@ -753,7 +755,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -763,7 +765,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141825F" + "20190625-020157F" ] } }, @@ -790,7 +792,7 @@ "value" : { "output" : [ " [filtered 4 lines of output]", - "P01 INFO: backup file /var/lib/postgresql/10/demo/global/pg_control (8KB, 99%) checksum e73a62aefed8d22d88b0077ff21307c014f46649", + "P01 INFO: backup file /var/lib/postgresql/10/demo/global/pg_control (8KB, 99%) checksum 52cd17e0aeeb68a0b978d3e068fe91d31d75b574", "P01 INFO: backup file /var/lib/postgresql/10/demo/pg_logical/replorigin_checkpoint (8B, 100%) checksum 347fc8f2df71bd4436e38bd1516ccd7ea0d46532", "P00 INFO: diff backup size = 8KB", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", @@ -827,18 +829,18 @@ " db (current)", " wal archive min/max (10-1): 000000010000000000000002/000000010000000000000003", "", - " full backup: 20190520-141825F", - " timestamp start/stop: 2019-05-20 14:18:25 / 2019-05-20 14:18:37", + " full backup: 20190625-020157F", + " timestamp start/stop: 2019-06-25 02:01:57 / 2019-06-25 02:02:10", " wal start/stop: 000000010000000000000002 / 000000010000000000000002", - " database size: 22.5MB, backup size: 22.5MB", + " database size: 22.4MB, backup size: 22.4MB", " repository size: 2.7MB, repository backup size: 2.7MB", "", - " diff backup: 20190520-141825F_20190520-141838D", - " timestamp start/stop: 2019-05-20 14:18:38 / 2019-05-20 14:18:40", + " diff backup: 20190625-020157F_20190625-020211D", + " timestamp start/stop: 2019-06-25 02:02:11 / 2019-06-25 02:02:13", " wal start/stop: 000000010000000000000003 / 000000010000000000000003", - " database size: 22.5MB, backup size: 8.2KB", + " database size: 22.4MB, backup size: 8.2KB", " repository size: 2.7MB, repository backup size: 517B", - " backup reference list: 20190520-141825F" + " backup reference list: 20190625-020157F" ] } }, @@ -972,9 +974,9 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", - "P00 INFO: last backup label = 20190520-141825F_20190520-141838D, version = 2.14", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:18:57\": backup begins after the next regular checkpoint completes", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", + "P00 INFO: last backup label = 20190625-020157F_20190625-020211D, version = 2.15", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 02:02:31\": backup begins after the next regular checkpoint completes", "P00 INFO: backup start archive = 000000020000000000000005, lsn = 0/5000028", "P00 WARN: a timeline switch has occurred since the last backup, enabling delta checksum", " [filtered 8 lines of output]" @@ -1033,11 +1035,11 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", - "P00 INFO: last backup label = 20190520-141825F_20190520-141857I, version = 2.14", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:19:01\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", + "P00 INFO: last backup label = 20190625-020157F_20190625-020231I, version = 2.15", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 02:02:36\": backup begins after the requested immediate checkpoint completes", "P00 INFO: backup start archive = 000000020000000000000006, lsn = 0/6000028", - "P01 INFO: backup file /var/lib/postgresql/10/demo/global/pg_control (8KB, 99%) checksum d270188c388574bfaba4fa9df26e6fb3b04debf1", + "P01 INFO: backup file /var/lib/postgresql/10/demo/global/pg_control (8KB, 99%) checksum d849b75b7c41237a1e91c7e2ae2a4ae7c5d1fe60", " [filtered 8 lines of output]" ] } @@ -1076,25 +1078,25 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 23570769,", + " \"delta\" : 23521617,", " \"repository\" : {", - " \"delta\" : 2789749,", - " \"size\" : 2789749", + " \"delta\" : 2790501,", + " \"size\" : 2790501", " },", - " \"size\" : 23570769", + " \"size\" : 23521617", " },", - " \"label\" : \"20190520-141825F\",", + " \"label\" : \"20190625-020157F\",", " \"prior\" : null,", " \"reference\" : null,", " \"timestamp\" : {", - " \"start\" : 1558361905,", - " \"stop\" : 1558361917", + " \"start\" : 1561428117,", + " \"stop\" : 1561428130", " },", " \"type\" : \"full\"", " },", @@ -1105,7 +1107,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -1114,18 +1116,18 @@ " \"delta\" : 8429,", " \"repository\" : {", " \"delta\" : 517,", - " \"size\" : 2789749", + " \"size\" : 2790501", " },", - " \"size\" : 23570769", + " \"size\" : 23521617", " },", - " \"label\" : \"20190520-141825F_20190520-141838D\",", - " \"prior\" : \"20190520-141825F\",", + " \"label\" : \"20190625-020157F_20190625-020211D\",", + " \"prior\" : \"20190625-020157F\",", " \"reference\" : [", - " \"20190520-141825F\"", + " \"20190625-020157F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361918,", - " \"stop\" : 1558361920", + " \"start\" : 1561428131,", + " \"stop\" : 1561428133", " },", " \"type\" : \"diff\"", " },", @@ -1136,7 +1138,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -1145,19 +1147,19 @@ " \"delta\" : 8421,", " \"repository\" : {", " \"delta\" : 469,", - " \"size\" : 2789749", + " \"size\" : 2790501", " },", - " \"size\" : 23570769", + " \"size\" : 23521617", " },", - " \"label\" : \"20190520-141825F_20190520-141857I\",", - " \"prior\" : \"20190520-141825F_20190520-141838D\",", + " \"label\" : \"20190625-020157F_20190625-020231I\",", + " \"prior\" : \"20190625-020157F_20190625-020211D\",", " \"reference\" : [", - " \"20190520-141825F\",", - " \"20190520-141825F_20190520-141838D\"", + " \"20190625-020157F\",", + " \"20190625-020157F_20190625-020211D\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361937,", - " \"stop\" : 1558361940", + " \"start\" : 1561428151,", + " \"stop\" : 1561428154", " },", " \"type\" : \"incr\"", " },", @@ -1168,7 +1170,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -1177,18 +1179,18 @@ " \"delta\" : 8429,", " \"repository\" : {", " \"delta\" : 517,", - " \"size\" : 2789749", + " \"size\" : 2790501", " },", - " \"size\" : 23570769", + " \"size\" : 23521617", " },", - " \"label\" : \"20190520-141825F_20190520-141901I\",", - " \"prior\" : \"20190520-141825F_20190520-141857I\",", + " \"label\" : \"20190625-020157F_20190625-020236I\",", + " \"prior\" : \"20190625-020157F_20190625-020231I\",", " \"reference\" : [", - " \"20190520-141825F\"", + " \"20190625-020157F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361941,", - " \"stop\" : 1558361944", + " \"start\" : 1561428156,", + " \"stop\" : 1561428158", " },", " \"type\" : \"incr\"", " }", @@ -1197,7 +1199,7 @@ " \"db\" : [", " {", " \"id\" : 1,", - " \"system-id\" : 6693113342182600951,", + " \"system-id\" : 6706282598478229752,", " \"version\" : \"10\"", " }", " ],", @@ -1352,7 +1354,7 @@ "output" : [ " name | last_successful_backup | last_archived_wal ", "--------+------------------------+--------------------------", - " \"demo\" | 2019-05-20 14:19:04+00 | 000000020000000000000006", + " \"demo\" | 2019-06-25 02:02:38+00 | 000000020000000000000006", "(1 row)" ] } @@ -1386,7 +1388,7 @@ "type" : "exe", "value" : { "output" : [ - "1558361944" + "1561428158" ] } }, @@ -1450,7 +1452,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-141825F|remove archive" + "archive retention on backup 20190625-020157F|remove archive" ] }, "host" : "pg-primary", @@ -1464,7 +1466,7 @@ " [filtered 951 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 DETAIL: archive retention on backup 20190520-141825F, archiveId = 10-1, start = 000000010000000000000002", + "P00 DETAIL: archive retention on backup 20190625-020157F, archiveId = 10-1, start = 000000010000000000000002", "P00 DETAIL: no archive to remove, archiveId = 10-1", "P00 INFO: expire command end: completed successfully" ] @@ -1474,7 +1476,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -1484,7 +1486,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141910F" + "20190625-020246F" ] } }, @@ -1499,7 +1501,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire full backup set\\: 20190520-141825F|archive retention on backup 20190520-141910F|remove archive" + "expire full backup set\\: 20190625-020157F|archive retention on backup 20190625-020246F|remove archive" ] }, "host" : "pg-primary", @@ -1513,9 +1515,9 @@ " [filtered 950 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire full backup set: 20190520-141825F, 20190520-141825F_20190520-141838D, 20190520-141825F_20190520-141857I, 20190520-141825F_20190520-141901I", - "P00 INFO: remove expired backup 20190520-141825F_20190520-141901I", - "P00 INFO: remove expired backup 20190520-141825F_20190520-141857I", + "P00 INFO: expire full backup set: 20190625-020157F, 20190625-020157F_20190625-020211D, 20190625-020157F_20190625-020231I, 20190625-020157F_20190625-020236I", + "P00 INFO: remove expired backup 20190625-020157F_20190625-020236I", + "P00 INFO: remove expired backup 20190625-020157F_20190625-020231I", " [filtered 2 lines of output]" ] } @@ -1568,7 +1570,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -1578,7 +1580,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141924F_20190520-141938D" + "20190625-020259F_20190625-020314D" ] } }, @@ -1606,7 +1608,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire diff backup set: 20190520-141924F_20190520-141938D" + "expire diff backup set: 20190625-020259F_20190625-020314D" ] }, "host" : "pg-primary", @@ -1620,9 +1622,9 @@ " [filtered 10 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire diff backup set: 20190520-141924F_20190520-141938D, 20190520-141924F_20190520-141942I", - "P00 INFO: remove expired backup 20190520-141924F_20190520-141942I", - "P00 INFO: remove expired backup 20190520-141924F_20190520-141938D" + "P00 INFO: expire diff backup set: 20190625-020259F_20190625-020314D, 20190625-020259F_20190625-020317I", + "P00 INFO: remove expired backup 20190625-020259F_20190625-020317I", + "P00 INFO: remove expired backup 20190625-020259F_20190625-020314D" ] } }, @@ -1661,7 +1663,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -1671,7 +1673,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141924F_20190520-141945D" + "20190625-020259F_20190625-020321D" ] } }, @@ -1712,10 +1714,10 @@ "type" : "exe", "value" : { "output" : [ - " [filtered 7 lines of output]", + " [filtered 8 lines of output]", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", "P00 INFO: backup stop archive = 000000020000000000000010, lsn = 0/100000F8", - "P00 INFO: new backup label = 20190520-141924F_20190520-141949D", + "P00 INFO: new backup label = 20190625-020259F_20190625-020326D", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin" ] @@ -1725,7 +1727,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -1735,7 +1737,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141924F_20190520-141949D" + "20190625-020259F_20190625-020326D" ] } }, @@ -1750,7 +1752,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-141924F_20190520-141945D|remove archive" + "archive retention on backup 20190625-020259F_20190625-020321D|remove archive" ] }, "host" : "pg-primary", @@ -1761,13 +1763,13 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: expire command begin 2.14: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", - "P00 DETAIL: archive retention on backup 20190520-141910F, archiveId = 10-1, start = 000000020000000000000008, stop = 000000020000000000000008", - "P00 DETAIL: archive retention on backup 20190520-141924F, archiveId = 10-1, start = 000000020000000000000009, stop = 000000020000000000000009", - "P00 DETAIL: archive retention on backup 20190520-141924F_20190520-141945D, archiveId = 10-1, start = 00000002000000000000000D, stop = 00000002000000000000000D", - "P00 DETAIL: archive retention on backup 20190520-141924F_20190520-141949D, archiveId = 10-1, start = 000000020000000000000010", - "P00 DETAIL: remove archive: archiveId = 10-1, start = 00000002000000000000000A, stop = 00000002000000000000000C", - "P00 DETAIL: remove archive: archiveId = 10-1, start = 00000002000000000000000E, stop = 00000002000000000000000F", + "P00 INFO: expire command begin 2.15: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", + "P00 DETAIL: archive retention on backup 20190625-020246F, archiveId = 10-1, start = 000000020000000000000008, stop = 000000020000000000000008", + "P00 DETAIL: archive retention on backup 20190625-020259F, archiveId = 10-1, start = 000000020000000000000009, stop = 000000020000000000000009", + "P00 DETAIL: archive retention on backup 20190625-020259F_20190625-020321D, archiveId = 10-1, start = 00000002000000000000000C, stop = 00000002000000000000000C", + "P00 DETAIL: archive retention on backup 20190625-020259F_20190625-020326D, archiveId = 10-1, start = 000000020000000000000010", + "P00 DETAIL: remove archive: archiveId = 10-1, start = 00000002000000000000000A, stop = 00000002000000000000000B", + "P00 DETAIL: remove archive: archiveId = 10-1, start = 00000002000000000000000D, stop = 00000002000000000000000F", "P00 INFO: expire command end: completed successfully" ] } @@ -1807,7 +1809,7 @@ "type" : "exe", "value" : { "output" : [ - " [filtered 762 lines of output]", + " [filtered 761 lines of output]", "P01 DETAIL: restore file /var/lib/postgresql/10/demo/base/12977/PG_VERSION - exists and matches backup (3B, 99%) checksum 4143d3a341877154d6e95211464e1df1015b74bd", "P01 DETAIL: restore file /var/lib/postgresql/10/demo/base/1/PG_VERSION - exists and matches backup (3B, 99%) checksum 4143d3a341877154d6e95211464e1df1015b74bd", "P01 DETAIL: restore file /var/lib/postgresql/10/demo/PG_VERSION - exists and matches backup (3B, 100%) checksum 4143d3a341877154d6e95211464e1df1015b74bd", @@ -2196,7 +2198,7 @@ "type" : "exe", "value" : { "output" : [ - "2019-05-20 14:20:31.107914+00" + "2019-06-25 02:04:10.358542+00" ] } }, @@ -2249,7 +2251,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:20:31.107914+00\" \\", + " --type=time \"--target=2019-06-25 02:04:10.358542+00\" \\", " --target-action=promote restore" ], "host" : "pg-primary", @@ -2294,7 +2296,7 @@ "value" : { "output" : [ "restore_command = 'pgbackrest --stanza=demo archive-get %f \"%p\"'", - "recovery_target_time = '2019-05-20 14:20:31.107914+00'", + "recovery_target_time = '2019-06-25 02:04:10.358542+00'", "recovery_target_action = 'promote'" ] } @@ -2376,16 +2378,16 @@ "output" : [ " [filtered 2 lines of output]", "LOG: listening on Unix socket \"/var/run/postgresql/.s.PGSQL.5432\"", - "LOG: database system was interrupted; last known up at 2019-05-20 14:20:24 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:20:31.107914+00", + "LOG: database system was interrupted; last known up at 2019-06-25 02:04:03 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 02:04:10.358542+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000016\" from archive", + "LOG: restored log file \"000000040000000000000015\" from archive", " [filtered 2 lines of output]", "LOG: database system is ready to accept read only connections", - "LOG: restored log file \"000000040000000000000017\" from archive", - "LOG: recovery stopping before commit of transaction 564, time 2019-05-20 14:20:31.392505+00", - "LOG: redo done at 0/17020A30", - "LOG: last completed transaction was at log time 2019-05-20 14:20:30.802982+00", + "LOG: restored log file \"000000040000000000000016\" from archive", + "LOG: recovery stopping before commit of transaction 564, time 2019-06-25 02:04:10.872712+00", + "LOG: redo done at 0/16021378", + "LOG: last completed transaction was at log time 2019-06-25 02:04:09.907842+00", "LOG: selected new timeline ID: 5", "LOG: archive recovery complete", " [filtered 3 lines of output]" @@ -2427,7 +2429,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -2437,7 +2439,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141924F_20190520-142023D" + "20190625-020259F_20190625-020403D" ] } }, @@ -2472,7 +2474,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:20:31.107914+00\" --target-action=promote restore" + " --type=time \"--target=2019-06-25 02:04:10.358542+00\" --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -2571,14 +2573,14 @@ "output" : [ " [filtered 2 lines of output]", "LOG: listening on Unix socket \"/var/run/postgresql/.s.PGSQL.5432\"", - "LOG: database system was interrupted; last known up at 2019-05-20 14:20:42 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:20:31.107914+00", + "LOG: database system was interrupted; last known up at 2019-06-25 02:04:25 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 02:04:10.358542+00", "LOG: restored log file \"00000005.history\" from archive", - "LOG: restored log file \"000000050000000000000018\" from archive", - "LOG: redo starts at 0/18000028", - "LOG: consistent recovery state reached at 0/180000F8", + "LOG: restored log file \"000000050000000000000017\" from archive", + "LOG: redo starts at 0/17000028", + "LOG: consistent recovery state reached at 0/170000F8", "LOG: database system is ready to accept read only connections", - "LOG: redo done at 0/180000F8", + "LOG: redo done at 0/170000F8", " [filtered 8 lines of output]" ] } @@ -2593,7 +2595,7 @@ "filter" : false, "filter-context" : 2, "list" : [ - "20190520-141924F_20190520-142023D" + "20190625-020259F_20190625-020403D" ] }, "host" : "pg-primary", @@ -2609,47 +2611,47 @@ " cipher: aes-256-cbc", "", " db (current)", - " wal archive min/max (10-1): 000000020000000000000008/000000050000000000000018", + " wal archive min/max (10-1): 000000020000000000000008/000000050000000000000017", "", - " full backup: 20190520-141910F", - " timestamp start/stop: 2019-05-20 14:19:10 / 2019-05-20 14:19:23", + " full backup: 20190625-020246F", + " timestamp start/stop: 2019-06-25 02:02:46 / 2019-06-25 02:02:58", " wal start/stop: 000000020000000000000008 / 000000020000000000000008", - " database size: 22.5MB, backup size: 22.5MB", + " database size: 22.4MB, backup size: 22.4MB", " repository size: 2.7MB, repository backup size: 2.7MB", "", - " full backup: 20190520-141924F", - " timestamp start/stop: 2019-05-20 14:19:24 / 2019-05-20 14:19:37", + " full backup: 20190625-020259F", + " timestamp start/stop: 2019-06-25 02:02:59 / 2019-06-25 02:03:12", " wal start/stop: 000000020000000000000009 / 000000020000000000000009", - " database size: 22.5MB, backup size: 22.5MB", + " database size: 22.4MB, backup size: 22.4MB", " repository size: 2.7MB, repository backup size: 2.7MB", "", - " diff backup: 20190520-141924F_20190520-141949D", - " timestamp start/stop: 2019-05-20 14:19:49 / 2019-05-20 14:19:52", + " diff backup: 20190625-020259F_20190625-020326D", + " timestamp start/stop: 2019-06-25 02:03:26 / 2019-06-25 02:03:28", " wal start/stop: 000000020000000000000010 / 000000020000000000000010", - " database size: 22.5MB, backup size: 8.2KB", - " repository size: 2.7MB, repository backup size: 519B", - " backup reference list: 20190520-141924F", + " database size: 22.4MB, backup size: 96.2KB", + " repository size: 2.7MB, repository backup size: 11.9KB", + " backup reference list: 20190625-020259F", "", - " incr backup: 20190520-141924F_20190520-142002I", - " timestamp start/stop: 2019-05-20 14:20:02 / 2019-05-20 14:20:12", - " wal start/stop: 000000030000000000000013 / 000000030000000000000013", - " database size: 37MB, backup size: 15.1MB", + " incr backup: 20190625-020259F_20190625-020339I", + " timestamp start/stop: 2019-06-25 02:03:39 / 2019-06-25 02:03:48", + " wal start/stop: 000000030000000000000012 / 000000030000000000000012", + " database size: 37MB, backup size: 15MB", " repository size: 4.4MB, repository backup size: 1.8MB", - " backup reference list: 20190520-141924F, 20190520-141924F_20190520-141949D", + " backup reference list: 20190625-020259F, 20190625-020259F_20190625-020326D", "", - " diff backup: 20190520-141924F_20190520-142023D", - " timestamp start/stop: 2019-05-20 14:20:23 / 2019-05-20 14:20:30", - " wal start/stop: 000000040000000000000016 / 000000040000000000000016", - " database size: 29.8MB, backup size: 7.8MB", - " repository size: 3.5MB, repository backup size: 947.7KB", - " backup reference list: 20190520-141924F", + " diff backup: 20190625-020259F_20190625-020403D", + " timestamp start/stop: 2019-06-25 02:04:03 / 2019-06-25 02:04:09", + " wal start/stop: 000000040000000000000015 / 000000040000000000000015", + " database size: 29.7MB, backup size: 7.8MB", + " repository size: 3.5MB, repository backup size: 948.7KB", + " backup reference list: 20190625-020259F", "", - " incr backup: 20190520-141924F_20190520-142041I", - " timestamp start/stop: 2019-05-20 14:20:41 / 2019-05-20 14:20:44", - " wal start/stop: 000000050000000000000018 / 000000050000000000000018", - " database size: 29.8MB, backup size: 2.1MB", - " repository size: 3.5MB, repository backup size: 218.2KB", - " backup reference list: 20190520-141924F, 20190520-141924F_20190520-142023D" + " incr backup: 20190625-020259F_20190625-020424I", + " timestamp start/stop: 2019-06-25 02:04:24 / 2019-06-25 02:04:27", + " wal start/stop: 000000050000000000000017 / 000000050000000000000017", + " database size: 29.7MB, backup size: 2MB", + " repository size: 3.5MB, repository backup size: 218.4KB", + " backup reference list: 20190625-020259F, 20190625-020259F_20190625-020403D" ] } }, @@ -2671,8 +2673,8 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:20:31.107914+00\" \\", - " --set=20190520-141924F_20190520-142023D --target-action=promote restore" + " --type=time \"--target=2019-06-25 02:04:10.358542+00\" \\", + " --set=20190625-020259F_20190625-020403D --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -2771,16 +2773,16 @@ "output" : [ " [filtered 2 lines of output]", "LOG: listening on Unix socket \"/var/run/postgresql/.s.PGSQL.5432\"", - "LOG: database system was interrupted; last known up at 2019-05-20 14:20:24 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:20:31.107914+00", + "LOG: database system was interrupted; last known up at 2019-06-25 02:04:03 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 02:04:10.358542+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000016\" from archive", + "LOG: restored log file \"000000040000000000000015\" from archive", " [filtered 2 lines of output]", "LOG: database system is ready to accept read only connections", - "LOG: restored log file \"000000040000000000000017\" from archive", - "LOG: recovery stopping before commit of transaction 564, time 2019-05-20 14:20:31.392505+00", - "LOG: redo done at 0/17020A30", - "LOG: last completed transaction was at log time 2019-05-20 14:20:30.802982+00", + "LOG: restored log file \"000000040000000000000016\" from archive", + "LOG: recovery stopping before commit of transaction 564, time 2019-06-25 02:04:10.872712+00", + "LOG: redo done at 0/16021378", + "LOG: last completed transaction was at log time 2019-06-25 02:04:09.907842+00", "LOG: restored log file \"00000005.history\" from archive", "LOG: restored log file \"00000006.history\" from archive", " [filtered 5 lines of output]" @@ -2805,9 +2807,22 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "aws s3 --no-verify-ssl mb s3://demo-bucket 2>&1" + "echo \"172.17.0.2 demo-bucket.s3.us-east-1.amazonaws.com s3.us-east-1.amazonaws.com\" | tee -a /etc/hosts" ], - "host" : "s3-server", + "host" : "pg-primary", + "load-env" : true, + "output" : false, + "run-as-user" : "root" + }, + "type" : "exe" + }, + { + "key" : { + "bash-wrap" : true, + "cmd" : [ + "mc config host add demo https://172.17.0.2 accessKey1 verySecretKey1 --insecure" + ], + "host" : "pg-primary", "load-env" : true, "output" : false, "run-as-user" : null @@ -2816,34 +2831,16 @@ }, { "key" : { - "file" : "/etc/pgbackrest/pgbackrest.conf", + "bash-wrap" : true, + "cmd" : [ + "mc mb demo/demo-bucket --insecure" + ], "host" : "pg-primary", - "option" : { - "global" : { - "repo1-cipher-pass" : {}, - "repo1-cipher-type" : { - "value" : "none" - } - } - } + "load-env" : true, + "output" : false, + "run-as-user" : null }, - "type" : "cfg-pgbackrest", - "value" : { - "config" : [ - "[demo]", - "pg1-path=/var/lib/postgresql/10/demo", - "", - "[global]", - "repo1-cipher-type=none", - "repo1-path=/var/lib/pgbackrest", - "repo1-retention-diff=2", - "repo1-retention-full=2", - "start-fast=y", - "", - "[global:archive-push]", - "compress-level=3" - ] - } + "type" : "exe" }, { "key" : { @@ -2861,7 +2858,7 @@ "value" : "demo-bucket" }, "repo1-s3-endpoint" : { - "value" : "s3.amazonaws.com" + "value" : "s3.us-east-1.amazonaws.com" }, "repo1-s3-key" : { "value" : "accessKey1" @@ -2872,9 +2869,6 @@ "repo1-s3-region" : { "value" : "us-east-1" }, - "repo1-s3-verify-ssl" : { - "value" : "n" - }, "repo1-type" : { "value" : "s3" } @@ -2889,12 +2883,13 @@ "", "[global]", "process-max=4", - "repo1-cipher-type=none", + "repo1-cipher-pass=zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO", + "repo1-cipher-type=aes-256-cbc", "repo1-path=/demo-repo", "repo1-retention-diff=2", "repo1-retention-full=2", "repo1-s3-bucket=demo-bucket", - "repo1-s3-endpoint=s3.amazonaws.com", + "repo1-s3-endpoint=s3.us-east-1.amazonaws.com", "repo1-s3-key=accessKey1", "repo1-s3-key-secret=verySecretKey1", "repo1-s3-region=us-east-1", @@ -2906,19 +2901,6 @@ ] } }, - { - "key" : { - "bash-wrap" : true, - "cmd" : [ - "echo \"172.17.0.3 demo-bucket.s3.amazonaws.com s3.amazonaws.com\" | tee -a /etc/hosts" - ], - "host" : "pg-primary", - "load-env" : true, - "output" : false, - "run-as-user" : "root" - }, - "type" : "exe" - }, { "key" : { "bash-wrap" : true, @@ -2940,7 +2922,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -2967,17 +2949,17 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=4 --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo --start-fast", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=4 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo --start-fast", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:21:13\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000070000000000000018, lsn = 0/18000028", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 02:05:04\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 000000070000000000000017, lsn = 0/17000028", " [filtered 1238 lines of output]", - "P01 INFO: backup file /var/lib/postgresql/10/demo/base/1/12825 (0B, 100%)", - "P04 INFO: backup file /var/lib/postgresql/10/demo/base/1/12815 (0B, 100%)", - "P00 INFO: full backup size = 29.8MB", + "P03 INFO: backup file /var/lib/postgresql/10/demo/base/1/12820 (0B, 100%)", + "P02 INFO: backup file /var/lib/postgresql/10/demo/base/1/12815 (0B, 100%)", + "P00 INFO: full backup size = 29.7MB", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: backup stop archive = 000000070000000000000018, lsn = 0/18000130", - " [filtered 4 lines of output]" + "P00 INFO: backup stop archive = 000000070000000000000017, lsn = 0/17000130", + " [filtered 5 lines of output]" ] } }, @@ -3015,7 +2997,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stop command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stop command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stop command end: completed successfully" ] } @@ -3041,7 +3023,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-delete command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-delete command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-delete command end: completed successfully" ] } @@ -3090,7 +3072,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "repository", @@ -3674,17 +3656,17 @@ " cipher: none", "", " db (current)", - " wal archive min/max (10-1): 00000008000000000000001E/000000080000000000000020", + " wal archive min/max (10-1): 00000008000000000000001D/00000008000000000000001F", "", - " full backup: 20190520-142240F", - " timestamp start/stop: 2019-05-20 14:22:40 / 2019-05-20 14:22:57", - " wal start/stop: 00000008000000000000001E / 00000008000000000000001E", + " full backup: 20190625-020629F", + " timestamp start/stop: 2019-06-25 02:06:29 / 2019-06-25 02:06:46", + " wal start/stop: 00000008000000000000001D / 00000008000000000000001D", " database size: 29.8MB, backup size: 29.8MB", " repository size: 3.5MB, repository backup size: 3.5MB", "", - " full backup: 20190520-142259F", - " timestamp start/stop: 2019-05-20 14:22:59 / 2019-05-20 14:23:06", - " wal start/stop: 000000080000000000000020 / 000000080000000000000020", + " full backup: 20190625-020648F", + " timestamp start/stop: 2019-06-25 02:06:48 / 2019-06-25 02:06:56", + " wal start/stop: 00000008000000000000001F / 00000008000000000000001F", " database size: 29.8MB, backup size: 29.8MB", " repository size: 3.5MB, repository backup size: 3.5MB" ] @@ -3830,7 +3812,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-standby", @@ -4156,7 +4138,7 @@ "value" : "3" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -4169,7 +4151,7 @@ "log_filename = 'postgresql.log'", "log_line_prefix = ''", "max_wal_senders = 3", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -4235,12 +4217,12 @@ "output" : [ " [filtered 3 lines of output]", "LOG: listening on Unix socket \"/var/run/postgresql/.s.PGSQL.5432\"", - "LOG: database system was interrupted; last known up at 2019-05-20 14:23:00 UTC", + "LOG: database system was interrupted; last known up at 2019-06-25 02:06:49 UTC", "LOG: entering standby mode", "LOG: restored log file \"00000008.history\" from archive", - "LOG: restored log file \"000000080000000000000020\" from archive", - "LOG: redo starts at 0/20000028", - "LOG: consistent recovery state reached at 0/200000F8", + "LOG: restored log file \"00000008000000000000001F\" from archive", + "LOG: redo starts at 0/1F000028", + "LOG: consistent recovery state reached at 0/1F0000F8", "LOG: database system is ready to accept read only connections", "LOG: incomplete startup packet" ] @@ -4323,7 +4305,7 @@ "output" : [ " pg_switch_wal | current_timestamp ", "---------------+-------------------------------", - " 0/2102ABE0 | 2019-05-20 14:23:44.986527+00", + " 0/2002B4F0 | 2019-06-25 02:07:43.160346+00", "(1 row)" ] } @@ -4350,9 +4332,9 @@ "type" : "exe", "value" : { "output" : [ - " message | current_timestamp ", - "----------------+------------------------------", - " Important Data | 2019-05-20 14:23:50.14123+00", + " message | current_timestamp ", + "----------------+-------------------------------", + " Important Data | 2019-06-25 02:07:47.687919+00", "(1 row)" ] } @@ -4378,7 +4360,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-host=repository --stanza=demo", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-host=repository --stanza=demo", "P00 INFO: switch wal cannot be performed on the standby, all other checks passed successfully", "P00 INFO: check command end: completed successfully" ] @@ -4592,9 +4574,9 @@ "value" : { "output" : [ " [filtered 11 lines of output]", - "LOG: restored log file \"000000080000000000000021\" from archive", + "LOG: restored log file \"000000080000000000000020\" from archive", "LOG: incomplete startup packet", - "LOG: started streaming WAL from primary at 0/22000000 on timeline 8" + "LOG: started streaming WAL from primary at 0/21000000 on timeline 8" ] } }, @@ -4626,7 +4608,7 @@ "output" : [ " message | current_timestamp ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:24:03.334249+00", + " Important Data | 2019-06-25 02:08:03.728204+00", "(1 row)" ] } @@ -4655,7 +4637,7 @@ "output" : [ " message | current_timestamp ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:24:03.783225+00", + " Important Data | 2019-06-25 02:08:04.471849+00", "(1 row)" ] } @@ -4887,8 +4869,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-host=repository --stanza=demo", - "P00 INFO: WAL segment 000000080000000000000027 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/10-1/0000000800000000/000000080000000000000027-769ede0ac58734b4be3b72d61c5af2f203af87e3.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --repo1-host=repository --stanza=demo", + "P00 INFO: WAL segment 000000080000000000000026 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/10-1/0000000800000000/000000080000000000000026-5bfb8590e2f586e88e6021db37f8fd7d17c2b686.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -4915,24 +4897,25 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000022", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000021", + "P01 DETAIL: pushed WAL file '000000080000000000000021' to the archive", + "P00 INFO: archive-push-async command end: completed successfully", + "", + "-------------------PROCESS START-------------------", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 4 WAL file(s) to archive: 000000080000000000000022...000000080000000000000025", + "P02 DETAIL: pushed WAL file '000000080000000000000023' to the archive", "P01 DETAIL: pushed WAL file '000000080000000000000022' to the archive", - "P00 INFO: archive-push-async command end: completed successfully", - "", - "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 4 WAL file(s) to archive: 000000080000000000000023...000000080000000000000026", "P02 DETAIL: pushed WAL file '000000080000000000000024' to the archive", - "P01 DETAIL: pushed WAL file '000000080000000000000023' to the archive", - "P02 DETAIL: pushed WAL file '000000080000000000000025' to the archive", - "P01 DETAIL: pushed WAL file '000000080000000000000026' to the archive", + "P01 DETAIL: pushed WAL file '000000080000000000000025' to the archive", "P00 INFO: archive-push-async command end: completed successfully", "", "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000027", - "P01 DETAIL: pushed WAL file '000000080000000000000027' to the archive" + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/postgresql/10/demo/pg_wal] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000026", + "P01 DETAIL: pushed WAL file '000000080000000000000026' to the archive", + "P00 INFO: archive-push-async command end: completed successfully" ] } }, @@ -4971,29 +4954,29 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-get-async command begin 2.14: [000000080000000000000020, 000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000020...000000080000000000000027", - "P01 DETAIL: found 000000080000000000000020 in the archive", - "P02 DETAIL: found 000000080000000000000021 in the archive", + "P00 INFO: archive-get-async command begin 2.15: [00000008000000000000001F, 000000080000000000000020, 000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: get 8 WAL file(s) from archive: 00000008000000000000001F...000000080000000000000026", + "P02 DETAIL: found 000000080000000000000020 in the archive", + "P01 DETAIL: found 00000008000000000000001F in the archive", "P01 DETAIL: unable to find 000000080000000000000022 in the archive", - "P02 DETAIL: unable to find 000000080000000000000023 in the archive", + "P02 DETAIL: unable to find 000000080000000000000021 in the archive", " [filtered 20 lines of output]", - "P00 INFO: archive-get-async command begin 2.14: [000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028, 000000080000000000000029] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000022...000000080000000000000029", - "P01 DETAIL: found 000000080000000000000022 in the archive", - "P02 DETAIL: found 000000080000000000000023 in the archive", - "P01 DETAIL: found 000000080000000000000024 in the archive", - "P02 DETAIL: found 000000080000000000000025 in the archive", + "P00 INFO: archive-get-async command begin 2.15: [000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/postgresql/10/demo --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000021...000000080000000000000028", + "P01 DETAIL: found 000000080000000000000021 in the archive", + "P02 DETAIL: found 000000080000000000000022 in the archive", + "P01 DETAIL: found 000000080000000000000023 in the archive", + "P02 DETAIL: found 000000080000000000000024 in the archive", + "P02 DETAIL: unable to find 000000080000000000000026 in the archive", "P02 DETAIL: unable to find 000000080000000000000027 in the archive", "P02 DETAIL: unable to find 000000080000000000000028 in the archive", - "P02 DETAIL: unable to find 000000080000000000000029 in the archive", - "P01 DETAIL: found 000000080000000000000026 in the archive", + "P01 DETAIL: found 000000080000000000000025 in the archive", "P00 INFO: archive-get-async command end: completed successfully", "", " [filtered 8 lines of output]", + "P02 DETAIL: unable to find 00000008000000000000002C in the archive", "P02 DETAIL: unable to find 00000008000000000000002D in the archive", - "P02 DETAIL: unable to find 00000008000000000000002E in the archive", - "P01 DETAIL: found 000000080000000000000027 in the archive", + "P01 DETAIL: found 000000080000000000000026 in the archive", "P00 INFO: archive-get-async command end: completed successfully" ] } @@ -5076,23 +5059,15 @@ "value" : { "output" : [ " [filtered 2 lines of output]", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:24:21\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000080000000000000029, lsn = 0/29000028", - "P00 INFO: wait for replay on the standby to reach 0/29000028", - "P00 INFO: replay on the standby reached 0/29000590, checkpoint 0/29000060", - "P04 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2674 (376KB, 16%) checksum fc25c72f2fc5d4817bf9884bb3a38951a3f0d31a", - "P02 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2608 (440KB, 35%) checksum 2f973b79387ac749a76d61402c9cef869d7d9140", - " [filtered 2 lines of output]", - "P04 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/1259 (88KB, 58%) checksum 3399602790622a2a44d9247af36d6586f5e08e34", - "P04 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/1247 (72KB, 61%) checksum 140854cccf02805dbbfc087389203bacebc46266", - "P01 INFO: backup file pg-primary:/var/lib/postgresql/10/demo/global/pg_control (8KB, 61%) checksum 1208676f23d194708c8da07a53f0794c12feb570", - "P03 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/1249 (392KB, 78%) checksum 1f1370163801172872276ec335f65c628f3192f6", - "P04 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2663 (48KB, 80%) checksum d00b3f587af2ba81ddfc714c0c42f8505c2e7659", - "P02 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2659 (80KB, 84%) checksum 85007f377676b20a923f22dbcd2af18304c4a456", - "P01 INFO: backup file pg-primary:/var/lib/postgresql/10/demo/pg_logical/replorigin_checkpoint (8B, 84%) checksum 347fc8f2df71bd4436e38bd1516ccd7ea0d46532", - "P03 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/3455 (40KB, 85%) checksum f8d3f42b4b3986b699f6d87756a1049c740766f2", - "P02 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2662 (32KB, 87%) checksum 98a8b78946d7cb36935e4cd836209f4d7bb3312f", - " [filtered 30 lines of output]" + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 02:08:25\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 000000080000000000000028, lsn = 0/28000028", + "P00 INFO: wait for replay on the standby to reach 0/28000028", + "P00 INFO: replay on the standby reached 0/28000108, checkpoint 0/28000060", + "P01 INFO: backup file pg-primary:/var/lib/postgresql/10/demo/global/pg_control (8KB, 0%) checksum fcf65db89e0d0bc985776c8c60a62af01c4121ec", + "P01 INFO: backup file pg-primary:/var/lib/postgresql/10/demo/pg_logical/replorigin_checkpoint (8B, 0%) checksum 347fc8f2df71bd4436e38bd1516ccd7ea0d46532", + "P02 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/2608 (440KB, 19%) checksum 6b75dba8ba9cb12bea08c18fc2c833d3d857a4d9", + "P03 INFO: backup file pg-standby:/var/lib/postgresql/10/demo/base/12978/1249 (392KB, 36%) checksum 0180bb0af20ddaf75c00578eb23902603150ead1", + " [filtered 39 lines of output]" ] } }, @@ -5211,7 +5186,7 @@ "value" : "5432" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -5224,7 +5199,7 @@ "log_line_prefix = ''", "max_wal_senders = 3", "port = 5432", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -5368,7 +5343,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-upgrade command begin 2.14: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/postgresql/11/demo --pg2-path=/var/lib/postgresql/11/demo --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-upgrade command begin 2.15: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/postgresql/11/demo --pg2-path=/var/lib/postgresql/11/demo --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-upgrade command end: completed successfully" ] } @@ -5589,6 +5564,21 @@ "{\"os-type\":\"centos6\"}" : { "all" : { "user-guide" : [ + { + "key" : { + "id" : "s3", + "image" : "minio/minio:RELEASE.2019-06-04T01-15-58Z", + "name" : "s3-server", + "option" : "-v {[host-repo-path]}/doc/resource/fake-cert/s3-server.crt:/root/.minio/certs/public.crt:ro -v {[host-repo-path]}/doc/resource/fake-cert/s3-server.key:/root/.minio/certs/private.key:ro -e MINIO_REGION=us-east-1 -e MINIO_DOMAIN=s3.us-east-1.amazonaws.com -e MINIO_BROWSER=off -e MINIO_ACCESS_KEY=accessKey1 -e MINIO_SECRET_KEY=verySecretKey1", + "os" : "centos6", + "param" : "server /data --address :443 --compat", + "update-hosts" : false + }, + "type" : "host", + "value" : { + "ip" : "172.17.0.2" + } + }, { "key" : { "id" : "build", @@ -5600,14 +5590,14 @@ }, "type" : "host", "value" : { - "ip" : "172.17.0.2" + "ip" : "172.17.0.3" } }, { "key" : { "bash-wrap" : true, "cmd" : [ - "sudo mkdir /root/pgbackrest-release-2.14" + "sudo mkdir /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -5620,7 +5610,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -5633,7 +5623,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -5679,7 +5669,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "(cd /root/pgbackrest-release-2.14/src && ./configure)" + "(cd /root/pgbackrest-release-2.15/src && ./configure)" ], "host" : "build", "load-env" : true, @@ -5692,7 +5682,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo make -s -C /root/pgbackrest-release-2.14/src" + "sudo make -s -C /root/pgbackrest-release-2.15/src" ], "host" : "build", "load-env" : true, @@ -5701,19 +5691,6 @@ }, "type" : "exe" }, - { - "key" : { - "id" : "s3", - "image" : "pgbackrest/test:s3-server-20180612A", - "name" : "s3-server", - "os" : "centos6", - "update-hosts" : true - }, - "type" : "host", - "value" : { - "ip" : "172.17.0.3" - } - }, { "key" : { "id" : "pg1", @@ -5732,7 +5709,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-primary", @@ -5875,7 +5852,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - General help", + "pgBackRest 2.15 - General help", "", "Usage:", " pgbackrest [options] [command]", @@ -6019,7 +5996,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - 'backup' command - 'log-path' option help", + "pgBackRest 2.15 - 'backup' command - 'log-path' option help", "", "Path where log files are stored.", "", @@ -6257,7 +6234,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -6283,8 +6260,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", - "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.5-1/0000000100000000/000000010000000000000001-809e82e0a27ee2b8d23a5fd3b3824061a6a301d4.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.5-1/0000000100000000/000000010000000000000001-41b5fea8d3574238c5a991ef095bd5cfb14028c4.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -6311,9 +6288,9 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:09:50\": backup begins after the next regular checkpoint completes", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:52:09\": backup begins after the next regular checkpoint completes", "P00 INFO: backup start archive = 000000010000000000000002, lsn = 0/2000028", " [filtered 851 lines of output]", "P01 INFO: backup file /var/lib/pgsql/9.5/data/base/1/12216 (0B, 100%)", @@ -6329,7 +6306,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -6339,7 +6316,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140950F" + "20190625-015209F" ] } }, @@ -6366,8 +6343,8 @@ "value" : { "output" : [ " [filtered 5 lines of output]", - "P01 INFO: backup file /var/lib/pgsql/9.5/data/pg_log/postgresql.log (887B, 97%) checksum 2f087a9b9ff3cddf4e73d9e340bac7ece1b9455b", - "P01 INFO: backup file /var/lib/pgsql/9.5/data/backup_label (236B, 100%) checksum 5390b13b89c35d9b1ca1bf31816495093e499d5a", + "P01 INFO: backup file /var/lib/pgsql/9.5/data/pg_log/postgresql.log (994B, 97%) checksum f029f8e154e8074e0c38216727ae6f0a5b7590a4", + "P01 INFO: backup file /var/lib/pgsql/9.5/data/backup_label (236B, 100%) checksum 91c6d3666702133d4fc0d8a771bc956bbd4061ec", "P00 INFO: diff backup size = 9KB", "P00 INFO: execute exclusive pg_stop_backup() and wait for all WAL segments to archive", "P00 INFO: backup stop archive = 000000010000000000000003, lsn = 0/30000F8", @@ -6403,18 +6380,18 @@ " db (current)", " wal archive min/max (9.5-1): 000000010000000000000002/000000010000000000000003", "", - " full backup: 20190520-140950F", - " timestamp start/stop: 2019-05-20 14:09:50 / 2019-05-20 14:10:02", + " full backup: 20190625-015209F", + " timestamp start/stop: 2019-06-25 01:52:09 / 2019-06-25 01:52:22", " wal start/stop: 000000010000000000000002 / 000000010000000000000002", - " database size: 20.5MB, backup size: 20.5MB", + " database size: 20.6MB, backup size: 20.6MB", " repository size: 2.4MB, repository backup size: 2.4MB", "", - " diff backup: 20190520-140950F_20190520-141003D", - " timestamp start/stop: 2019-05-20 14:10:03 / 2019-05-20 14:10:06", + " diff backup: 20190625-015209F_20190625-015223D", + " timestamp start/stop: 2019-06-25 01:52:23 / 2019-06-25 01:52:27", " wal start/stop: 000000010000000000000003 / 000000010000000000000003", - " database size: 20.5MB, backup size: 9KB", + " database size: 20.6MB, backup size: 9.2KB", " repository size: 2.4MB, repository backup size: 752B", - " backup reference list: 20190520-140950F" + " backup reference list: 20190625-015209F" ] } }, @@ -6572,10 +6549,10 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", - "P00 INFO: last backup label = 20190520-140950F_20190520-141003D, version = 2.14", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:10:25\": backup begins after the next regular checkpoint completes", - "P00 INFO: backup start archive = 000000020000000000000005, lsn = 0/5000028", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", + "P00 INFO: last backup label = 20190625-015209F_20190625-015223D, version = 2.15", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:52:47\": backup begins after the next regular checkpoint completes", + "P00 INFO: backup start archive = 000000020000000000000006, lsn = 0/6000028", "P00 WARN: a timeline switch has occurred since the last backup, enabling delta checksum", " [filtered 10 lines of output]" ] @@ -6633,11 +6610,11 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", - "P00 INFO: last backup label = 20190520-140950F_20190520-141025I, version = 2.14", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:10:30\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000020000000000000006, lsn = 0/6000028", - "P01 INFO: backup file /var/lib/pgsql/9.5/data/global/pg_control (8KB, 81%) checksum 8eeff8511e848b512bec935dd462aa6a2c859052", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", + "P00 INFO: last backup label = 20190625-015209F_20190625-015247I, version = 2.15", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:52:55\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 000000020000000000000007, lsn = 0/7000028", + "P01 INFO: backup file /var/lib/pgsql/9.5/data/global/pg_control (8KB, 78%) checksum 2b4ab9f47cf459daf998f4882a6ab93f35c0c24d", " [filtered 9 lines of output]" ] } @@ -6679,9 +6656,9 @@ "value" : { "output" : [ " [filtered 2 lines of output]", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:10:35\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000020000000000000008, lsn = 0/8000028", - "P00 ERROR: [047]: unable to create path '/var/lib/pgbackrest/backup/demo/20190520-140950F_20190520-141035I': Permission denied", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:52:59\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 000000020000000000000009, lsn = 0/9000028", + "P00 ERROR: [047]: unable to create path '/var/lib/pgbackrest/backup/demo/20190625-015209F_20190625-015259I': Permission denied", "P00 INFO: backup command end: aborted with exception [047]" ] } @@ -6722,12 +6699,12 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", - "P00 INFO: last backup label = 20190520-140950F_20190520-141030I, version = 2.14", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:10:37\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", + "P00 INFO: last backup label = 20190625-015209F_20190625-015255I, version = 2.15", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:53:03\": backup begins after the requested immediate checkpoint completes", "P00 ERROR: [057]: ERROR: a backup is already in progress", " HINT: Run pg_stop_backup() and try again.:", - " select to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SS.US TZ'), pg_xlogfile_name(lsn), lsn::text, (select setting::int8 from pg_settings where name = 'wal_segment_size') * (select setting::int8 from pg_settings where name = 'wal_block_size') from pg_start_backup('pgBackRest backup started at 2019-05-20 14:10:37', true) as lsn" + " select to_char(current_timestamp, 'YYYY-MM-DD HH24:MI:SS.US TZ'), pg_xlogfile_name(lsn), lsn::text, (select setting::int8 from pg_settings where name = 'wal_segment_size') * (select setting::int8 from pg_settings where name = 'wal_block_size') from pg_start_backup('pgBackRest backup started at 2019-06-25 01:53:03', true) as lsn" ] } }, @@ -6784,13 +6761,13 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --stop-auto --type=incr", - "P00 INFO: last backup label = 20190520-140950F_20190520-141030I, version = 2.14", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --stop-auto --type=incr", + "P00 INFO: last backup label = 20190625-015209F_20190625-015255I, version = 2.15", "P00 WARN: the cluster is already in backup mode but no pgBackRest backup process is running. pg_stop_backup() will be called so a new backup can be started.", "P00 INFO: execute exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:10:40\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000020000000000000009, lsn = 0/9000028", - "P01 INFO: backup file /var/lib/pgsql/9.5/data/global/pg_control (8KB, 75%) checksum 297c9ea9008c3f098757084d5919893cc0af8400", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:53:06\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 00000002000000000000000A, lsn = 0/A000028", + "P01 INFO: backup file /var/lib/pgsql/9.5/data/global/pg_control (8KB, 74%) checksum 15659858720228725f21d947dfa2ddc1ee8c284b", " [filtered 9 lines of output]" ] } @@ -6817,7 +6794,7 @@ " \"id\" : 1", " },", " \"id\" : \"9.5-1\",", - " \"max\" : \"000000020000000000000009\",", + " \"max\" : \"00000002000000000000000A\",", " \"min\" : \"000000010000000000000002\"", " }", " ],", @@ -6829,25 +6806,25 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 21501895,", + " \"delta\" : 21551047,", " \"repository\" : {", - " \"delta\" : 2529232,", - " \"size\" : 2529232", + " \"delta\" : 2531120,", + " \"size\" : 2531120", " },", - " \"size\" : 21501895", + " \"size\" : 21551047", " },", - " \"label\" : \"20190520-140950F\",", + " \"label\" : \"20190625-015209F\",", " \"prior\" : null,", " \"reference\" : null,", " \"timestamp\" : {", - " \"start\" : 1558361390,", - " \"stop\" : 1558361402", + " \"start\" : 1561427529,", + " \"stop\" : 1561427542", " },", " \"type\" : \"full\"", " },", @@ -6858,120 +6835,120 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 9315,", + " \"delta\" : 9422,", " \"repository\" : {", " \"delta\" : 752,", - " \"size\" : 2529232", + " \"size\" : 2531120", " },", - " \"size\" : 21502002", + " \"size\" : 21551261", " },", - " \"label\" : \"20190520-140950F_20190520-141003D\",", - " \"prior\" : \"20190520-140950F\",", + " \"label\" : \"20190625-015209F_20190625-015223D\",", + " \"prior\" : \"20190625-015209F\",", " \"reference\" : [", - " \"20190520-140950F\"", + " \"20190625-015209F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361403,", - " \"stop\" : 1558361406", + " \"start\" : 1561427543,", + " \"stop\" : 1561427547", " },", " \"type\" : \"diff\"", " },", " {", " \"archive\" : {", - " \"start\" : \"000000020000000000000005\",", - " \"stop\" : \"000000020000000000000005\"", - " },", - " \"backrest\" : {", - " \"format\" : 5,", - " \"version\" : \"2.14\"", - " },", - " \"database\" : {", - " \"id\" : 1", - " },", - " \"info\" : {", - " \"delta\" : 10097,", - " \"repository\" : {", - " \"delta\" : 912,", - " \"size\" : 2529392", - " },", - " \"size\" : 21502784", - " },", - " \"label\" : \"20190520-140950F_20190520-141025I\",", - " \"prior\" : \"20190520-140950F_20190520-141003D\",", - " \"reference\" : [", - " \"20190520-140950F\"", - " ],", - " \"timestamp\" : {", - " \"start\" : 1558361425,", - " \"stop\" : 1558361429", - " },", - " \"type\" : \"incr\"", - " },", - " {", - " \"archive\" : {", " \"start\" : \"000000020000000000000006\",", " \"stop\" : \"000000020000000000000006\"", " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 10204,", + " \"delta\" : 10268,", " \"repository\" : {", - " \"delta\" : 912,", - " \"size\" : 2529392", + " \"delta\" : 928,", + " \"size\" : 2531296", " },", - " \"size\" : 21502891", + " \"size\" : 21552107", " },", - " \"label\" : \"20190520-140950F_20190520-141030I\",", - " \"prior\" : \"20190520-140950F_20190520-141025I\",", + " \"label\" : \"20190625-015209F_20190625-015247I\",", + " \"prior\" : \"20190625-015209F_20190625-015223D\",", " \"reference\" : [", - " \"20190520-140950F\"", + " \"20190625-015209F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361430,", - " \"stop\" : 1558361434", + " \"start\" : 1561427567,", + " \"stop\" : 1561427572", " },", " \"type\" : \"incr\"", " },", " {", " \"archive\" : {", - " \"start\" : \"000000020000000000000009\",", - " \"stop\" : \"000000020000000000000009\"", + " \"start\" : \"000000020000000000000007\",", + " \"stop\" : \"000000020000000000000007\"", " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 10843,", + " \"delta\" : 10375,", " \"repository\" : {", - " \"delta\" : 1104,", - " \"size\" : 2529584", + " \"delta\" : 928,", + " \"size\" : 2531296", " },", - " \"size\" : 21503530", + " \"size\" : 21552214", " },", - " \"label\" : \"20190520-140950F_20190520-141040I\",", - " \"prior\" : \"20190520-140950F_20190520-141030I\",", + " \"label\" : \"20190625-015209F_20190625-015255I\",", + " \"prior\" : \"20190625-015209F_20190625-015247I\",", " \"reference\" : [", - " \"20190520-140950F\"", + " \"20190625-015209F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558361440,", - " \"stop\" : 1558361444", + " \"start\" : 1561427575,", + " \"stop\" : 1561427578", + " },", + " \"type\" : \"incr\"", + " },", + " {", + " \"archive\" : {", + " \"start\" : \"00000002000000000000000A\",", + " \"stop\" : \"00000002000000000000000A\"", + " },", + " \"backrest\" : {", + " \"format\" : 5,", + " \"version\" : \"2.15\"", + " },", + " \"database\" : {", + " \"id\" : 1", + " },", + " \"info\" : {", + " \"delta\" : 11014,", + " \"repository\" : {", + " \"delta\" : 1136,", + " \"size\" : 2531504", + " },", + " \"size\" : 21552853", + " },", + " \"label\" : \"20190625-015209F_20190625-015306I\",", + " \"prior\" : \"20190625-015209F_20190625-015255I\",", + " \"reference\" : [", + " \"20190625-015209F\"", + " ],", + " \"timestamp\" : {", + " \"start\" : 1561427586,", + " \"stop\" : 1561427590", " },", " \"type\" : \"incr\"", " }", @@ -6980,7 +6957,7 @@ " \"db\" : [", " {", " \"id\" : 1,", - " \"system-id\" : 6693111130106151170,", + " \"system-id\" : 6706280076246565125,", " \"version\" : \"9.5\"", " }", " ],", @@ -7135,7 +7112,7 @@ "output" : [ " name | last_successful_backup | last_archived_wal ", "--------+------------------------+--------------------------", - " \"demo\" | 2019-05-20 14:10:44+00 | 000000020000000000000009", + " \"demo\" | 2019-06-25 01:53:10+00 | 00000002000000000000000A", "(1 row)" ] } @@ -7182,7 +7159,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-140950F|remove archive" + "archive retention on backup 20190625-015209F|remove archive" ] }, "host" : "pg-primary", @@ -7196,7 +7173,7 @@ " [filtered 860 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 DETAIL: archive retention on backup 20190520-140950F, archiveId = 9.5-1, start = 000000010000000000000002", + "P00 DETAIL: archive retention on backup 20190625-015209F, archiveId = 9.5-1, start = 000000010000000000000002", "P00 DETAIL: no archive to remove, archiveId = 9.5-1", "P00 INFO: expire command end: completed successfully" ] @@ -7206,7 +7183,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -7216,7 +7193,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141047F" + "20190625-015315F" ] } }, @@ -7231,7 +7208,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire full backup set\\: 20190520-140950F|archive retention on backup 20190520-141047F|remove archive" + "expire full backup set\\: 20190625-015209F|archive retention on backup 20190625-015315F|remove archive" ] }, "host" : "pg-primary", @@ -7245,9 +7222,9 @@ " [filtered 860 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire full backup set: 20190520-140950F, 20190520-140950F_20190520-141003D, 20190520-140950F_20190520-141025I, 20190520-140950F_20190520-141030I, 20190520-140950F_20190520-141040I", - "P00 INFO: remove expired backup 20190520-140950F_20190520-141040I", - "P00 INFO: remove expired backup 20190520-140950F_20190520-141030I", + "P00 INFO: expire full backup set: 20190625-015209F, 20190625-015209F_20190625-015223D, 20190625-015209F_20190625-015247I, 20190625-015209F_20190625-015255I, 20190625-015209F_20190625-015306I", + "P00 INFO: remove expired backup 20190625-015209F_20190625-015306I", + "P00 INFO: remove expired backup 20190625-015209F_20190625-015255I", " [filtered 3 lines of output]" ] } @@ -7301,7 +7278,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -7311,7 +7288,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141100F_20190520-141115D" + "20190625-015328F_20190625-015343D" ] } }, @@ -7339,7 +7316,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire diff backup set: 20190520-141100F_20190520-141115D" + "expire diff backup set: 20190625-015328F_20190625-015343D" ] }, "host" : "pg-primary", @@ -7353,9 +7330,9 @@ " [filtered 12 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire diff backup set: 20190520-141100F_20190520-141115D, 20190520-141100F_20190520-141120I", - "P00 INFO: remove expired backup 20190520-141100F_20190520-141120I", - "P00 INFO: remove expired backup 20190520-141100F_20190520-141115D" + "P00 INFO: expire diff backup set: 20190625-015328F_20190625-015343D, 20190625-015328F_20190625-015348I", + "P00 INFO: remove expired backup 20190625-015328F_20190625-015348I", + "P00 INFO: remove expired backup 20190625-015328F_20190625-015343D" ] } }, @@ -7395,7 +7372,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -7405,7 +7382,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141100F_20190520-141124D" + "20190625-015328F_20190625-015353D" ] } }, @@ -7448,8 +7425,8 @@ "output" : [ " [filtered 9 lines of output]", "P00 INFO: execute exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: backup stop archive = 000000020000000000000012, lsn = 0/120000F8", - "P00 INFO: new backup label = 20190520-141100F_20190520-141129D", + "P00 INFO: backup stop archive = 000000020000000000000015, lsn = 0/150000F8", + "P00 INFO: new backup label = 20190625-015328F_20190625-015401D", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin" ] @@ -7459,7 +7436,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -7469,7 +7446,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141100F_20190520-141129D" + "20190625-015328F_20190625-015401D" ] } }, @@ -7484,7 +7461,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-141100F_20190520-141124D|remove archive" + "archive retention on backup 20190625-015328F_20190625-015353D|remove archive" ] }, "host" : "pg-primary", @@ -7495,13 +7472,14 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: expire command begin 2.14: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", - "P00 DETAIL: archive retention on backup 20190520-141047F, archiveId = 9.5-1, start = 00000002000000000000000B, stop = 00000002000000000000000B", - "P00 DETAIL: archive retention on backup 20190520-141100F, archiveId = 9.5-1, start = 00000002000000000000000C, stop = 00000002000000000000000C", - "P00 DETAIL: archive retention on backup 20190520-141100F_20190520-141124D, archiveId = 9.5-1, start = 00000002000000000000000F, stop = 00000002000000000000000F", - "P00 DETAIL: archive retention on backup 20190520-141100F_20190520-141129D, archiveId = 9.5-1, start = 000000020000000000000012", - "P00 DETAIL: remove archive: archiveId = 9.5-1, start = 00000002000000000000000D, stop = 00000002000000000000000E", - "P00 DETAIL: remove archive: archiveId = 9.5-1, start = 000000020000000000000010, stop = 000000020000000000000011", + "P00 INFO: expire command begin 2.15: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", + "P00 DETAIL: archive retention on backup 20190625-015315F, archiveId = 9.5-1, start = 00000002000000000000000C, stop = 00000002000000000000000C", + "P00 DETAIL: archive retention on backup 20190625-015328F, archiveId = 9.5-1, start = 00000002000000000000000E, stop = 00000002000000000000000E", + "P00 DETAIL: archive retention on backup 20190625-015328F_20190625-015353D, archiveId = 9.5-1, start = 000000020000000000000012, stop = 000000020000000000000012", + "P00 DETAIL: archive retention on backup 20190625-015328F_20190625-015401D, archiveId = 9.5-1, start = 000000020000000000000015", + "P00 DETAIL: remove archive: archiveId = 9.5-1, start = 00000002000000000000000D, stop = 00000002000000000000000D", + "P00 DETAIL: remove archive: archiveId = 9.5-1, start = 00000002000000000000000F, stop = 000000020000000000000011", + "P00 DETAIL: remove archive: archiveId = 9.5-1, start = 000000020000000000000013, stop = 000000020000000000000014", "P00 INFO: expire command end: completed successfully" ] } @@ -7924,7 +7902,7 @@ "type" : "exe", "value" : { "output" : [ - "2019-05-20 14:12:14.11214+00" + "2019-06-25 01:54:48.389605+00" ] } }, @@ -7977,7 +7955,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:12:14.11214+00\" \\", + " --type=time \"--target=2019-06-25 01:54:48.389605+00\" \\", " --target-action=promote restore" ], "host" : "pg-primary", @@ -8022,7 +8000,7 @@ "value" : { "output" : [ "restore_command = 'pgbackrest --stanza=demo archive-get %f \"%p\"'", - "recovery_target_time = '2019-05-20 14:12:14.11214+00'", + "recovery_target_time = '2019-06-25 01:54:48.389605+00'", "recovery_target_action = 'promote'" ] } @@ -8102,16 +8080,16 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:12:06 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:12:14.11214+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:54:40 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:54:48.389605+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000017\" from archive", - "LOG: redo starts at 0/17000028", - "LOG: consistent recovery state reached at 0/170000F8", - "LOG: restored log file \"000000040000000000000018\" from archive", - "LOG: recovery stopping before commit of transaction 630, time 2019-05-20 14:12:14.366745+00", - "LOG: redo done at 0/1801C108", - "LOG: last completed transaction was at log time 2019-05-20 14:12:13.850396+00", + "LOG: restored log file \"00000004000000000000001A\" from archive", + "LOG: redo starts at 0/1A000028", + "LOG: consistent recovery state reached at 0/1A0000F8", + "LOG: restored log file \"00000004000000000000001B\" from archive", + "LOG: recovery stopping before commit of transaction 630, time 2019-06-25 01:54:48.81305+00", + "LOG: redo done at 0/1B01B9C0", + "LOG: last completed transaction was at log time 2019-06-25 01:54:47.95498+00", "LOG: selected new timeline ID: 5", "LOG: archive recovery complete", " [filtered 4 lines of output]" @@ -8153,7 +8131,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -8163,7 +8141,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-141100F_20190520-141205D" + "20190625-015328F_20190625-015439D" ] } }, @@ -8198,7 +8176,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:12:14.11214+00\" --target-action=promote restore" + " --type=time \"--target=2019-06-25 01:54:48.389605+00\" --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -8295,14 +8273,14 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:12:25 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:12:14.11214+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:55:01 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:54:48.389605+00", "LOG: restored log file \"00000005.history\" from archive", - "LOG: restored log file \"000000050000000000000019\" from archive", - "LOG: redo starts at 0/19000028", - "LOG: consistent recovery state reached at 0/190000F8", - "LOG: redo done at 0/190000F8", - "LOG: restored log file \"000000050000000000000019\" from archive", + "LOG: restored log file \"00000005000000000000001C\" from archive", + "LOG: redo starts at 0/1C000028", + "LOG: consistent recovery state reached at 0/1C0000F8", + "LOG: redo done at 0/1C0000F8", + "LOG: restored log file \"00000005000000000000001C\" from archive", " [filtered 8 lines of output]" ] } @@ -8317,7 +8295,7 @@ "filter" : false, "filter-context" : 2, "list" : [ - "20190520-141100F_20190520-141205D" + "20190625-015328F_20190625-015439D" ] }, "host" : "pg-primary", @@ -8333,47 +8311,47 @@ " cipher: aes-256-cbc", "", " db (current)", - " wal archive min/max (9.5-1): 00000002000000000000000B/000000050000000000000019", + " wal archive min/max (9.5-1): 00000002000000000000000C/00000005000000000000001C", "", - " full backup: 20190520-141047F", - " timestamp start/stop: 2019-05-20 14:10:47 / 2019-05-20 14:10:59", - " wal start/stop: 00000002000000000000000B / 00000002000000000000000B", - " database size: 20.5MB, backup size: 20.5MB", - " repository size: 2.4MB, repository backup size: 2.4MB", - "", - " full backup: 20190520-141100F", - " timestamp start/stop: 2019-05-20 14:11:00 / 2019-05-20 14:11:14", + " full backup: 20190625-015315F", + " timestamp start/stop: 2019-06-25 01:53:15 / 2019-06-25 01:53:27", " wal start/stop: 00000002000000000000000C / 00000002000000000000000C", - " database size: 20.5MB, backup size: 20.5MB", + " database size: 20.6MB, backup size: 20.6MB", " repository size: 2.4MB, repository backup size: 2.4MB", "", - " diff backup: 20190520-141100F_20190520-141129D", - " timestamp start/stop: 2019-05-20 14:11:29 / 2019-05-20 14:11:33", - " wal start/stop: 000000020000000000000012 / 000000020000000000000012", - " database size: 20.5MB, backup size: 116KB", - " repository size: 2.4MB, repository backup size: 12.7KB", - " backup reference list: 20190520-141100F", + " full backup: 20190625-015328F", + " timestamp start/stop: 2019-06-25 01:53:28 / 2019-06-25 01:53:41", + " wal start/stop: 00000002000000000000000E / 00000002000000000000000E", + " database size: 20.6MB, backup size: 20.6MB", + " repository size: 2.4MB, repository backup size: 2.4MB", "", - " incr backup: 20190520-141100F_20190520-141143I", - " timestamp start/stop: 2019-05-20 14:11:43 / 2019-05-20 14:11:54", - " wal start/stop: 000000030000000000000014 / 000000030000000000000014", + " diff backup: 20190625-015328F_20190625-015401D", + " timestamp start/stop: 2019-06-25 01:54:01 / 2019-06-25 01:54:04", + " wal start/stop: 000000020000000000000015 / 000000020000000000000015", + " database size: 20.6MB, backup size: 116.3KB", + " repository size: 2.4MB, repository backup size: 12.7KB", + " backup reference list: 20190625-015328F", + "", + " incr backup: 20190625-015328F_20190625-015415I", + " timestamp start/stop: 2019-06-25 01:54:15 / 2019-06-25 01:54:26", + " wal start/stop: 000000030000000000000017 / 000000030000000000000017", " database size: 33.9MB, backup size: 13.4MB", " repository size: 4MB, repository backup size: 1.6MB", - " backup reference list: 20190520-141100F, 20190520-141100F_20190520-141129D", + " backup reference list: 20190625-015328F, 20190625-015328F_20190625-015401D", "", - " diff backup: 20190520-141100F_20190520-141205D", - " timestamp start/stop: 2019-05-20 14:12:05 / 2019-05-20 14:12:13", - " wal start/stop: 000000040000000000000017 / 000000040000000000000017", - " database size: 27.2MB, backup size: 6.8MB", - " repository size: 3.2MB, repository backup size: 831.1KB", - " backup reference list: 20190520-141100F", + " diff backup: 20190625-015328F_20190625-015439D", + " timestamp start/stop: 2019-06-25 01:54:39 / 2019-06-25 01:54:47", + " wal start/stop: 00000004000000000000001A / 00000004000000000000001A", + " database size: 27.3MB, backup size: 6.9MB", + " repository size: 3.2MB, repository backup size: 831.8KB", + " backup reference list: 20190625-015328F", "", - " incr backup: 20190520-141100F_20190520-141224I", - " timestamp start/stop: 2019-05-20 14:12:24 / 2019-05-20 14:12:28", - " wal start/stop: 000000050000000000000019 / 000000050000000000000019", - " database size: 27.2MB, backup size: 2.0MB", - " repository size: 3.2MB, repository backup size: 209.3KB", - " backup reference list: 20190520-141100F, 20190520-141100F_20190520-141205D" + " incr backup: 20190625-015328F_20190625-015500I", + " timestamp start/stop: 2019-06-25 01:55:00 / 2019-06-25 01:55:05", + " wal start/stop: 00000005000000000000001C / 00000005000000000000001C", + " database size: 27.3MB, backup size: 2.0MB", + " repository size: 3.2MB, repository backup size: 209.9KB", + " backup reference list: 20190625-015328F, 20190625-015328F_20190625-015439D" ] } }, @@ -8395,8 +8373,8 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:12:14.11214+00\" \\", - " --set=20190520-141100F_20190520-141205D --target-action=promote restore" + " --type=time \"--target=2019-06-25 01:54:48.389605+00\" \\", + " --set=20190625-015328F_20190625-015439D --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -8493,19 +8471,19 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:12:06 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:12:14.11214+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:54:40 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:54:48.389605+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000017\" from archive", - " [filtered 2 lines of output]", - "FATAL: the database system is starting up", - "LOG: restored log file \"000000040000000000000018\" from archive", - "LOG: recovery stopping before commit of transaction 630, time 2019-05-20 14:12:14.366745+00", - "LOG: redo done at 0/1801C108", - "LOG: last completed transaction was at log time 2019-05-20 14:12:13.850396+00", + "LOG: restored log file \"00000004000000000000001A\" from archive", + "LOG: redo starts at 0/1A000028", + "LOG: consistent recovery state reached at 0/1A0000F8", + "LOG: restored log file \"00000004000000000000001B\" from archive", + "LOG: recovery stopping before commit of transaction 630, time 2019-06-25 01:54:48.81305+00", + "LOG: redo done at 0/1B01B9C0", + "LOG: last completed transaction was at log time 2019-06-25 01:54:47.95498+00", "LOG: restored log file \"00000005.history\" from archive", "LOG: restored log file \"00000006.history\" from archive", - " [filtered 5 lines of output]" + " [filtered 6 lines of output]" ] } }, @@ -8527,9 +8505,22 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "aws s3 --no-verify-ssl mb s3://demo-bucket 2>&1" + "echo \"172.17.0.2 demo-bucket.s3.us-east-1.amazonaws.com s3.us-east-1.amazonaws.com\" | tee -a /etc/hosts" ], - "host" : "s3-server", + "host" : "pg-primary", + "load-env" : true, + "output" : false, + "run-as-user" : "root" + }, + "type" : "exe" + }, + { + "key" : { + "bash-wrap" : true, + "cmd" : [ + "mc config host add demo https://172.17.0.2 accessKey1 verySecretKey1 --insecure" + ], + "host" : "pg-primary", "load-env" : true, "output" : false, "run-as-user" : null @@ -8538,35 +8529,16 @@ }, { "key" : { - "file" : "/etc/pgbackrest/pgbackrest.conf", + "bash-wrap" : true, + "cmd" : [ + "mc mb demo/demo-bucket --insecure" + ], "host" : "pg-primary", - "option" : { - "global" : { - "repo1-cipher-pass" : {}, - "repo1-cipher-type" : { - "value" : "none" - } - } - } + "load-env" : true, + "output" : false, + "run-as-user" : null }, - "type" : "cfg-pgbackrest", - "value" : { - "config" : [ - "[demo]", - "pg1-path=/var/lib/pgsql/9.5/data", - "", - "[global]", - "repo1-cipher-type=none", - "repo1-path=/var/lib/pgbackrest", - "repo1-retention-diff=2", - "repo1-retention-full=2", - "start-fast=y", - "stop-auto=y", - "", - "[global:archive-push]", - "compress-level=3" - ] - } + "type" : "exe" }, { "key" : { @@ -8583,8 +8555,11 @@ "repo1-s3-bucket" : { "value" : "demo-bucket" }, + "repo1-s3-ca-file" : { + "value" : "/etc/pki/tls/certs/ca-bundle.crt" + }, "repo1-s3-endpoint" : { - "value" : "s3.amazonaws.com" + "value" : "s3.us-east-1.amazonaws.com" }, "repo1-s3-key" : { "value" : "accessKey1" @@ -8595,9 +8570,6 @@ "repo1-s3-region" : { "value" : "us-east-1" }, - "repo1-s3-verify-ssl" : { - "value" : "n" - }, "repo1-type" : { "value" : "s3" } @@ -8612,12 +8584,14 @@ "", "[global]", "process-max=4", - "repo1-cipher-type=none", + "repo1-cipher-pass=zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO", + "repo1-cipher-type=aes-256-cbc", "repo1-path=/demo-repo", "repo1-retention-diff=2", "repo1-retention-full=2", "repo1-s3-bucket=demo-bucket", - "repo1-s3-endpoint=s3.amazonaws.com", + "repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt", + "repo1-s3-endpoint=s3.us-east-1.amazonaws.com", "repo1-s3-key=accessKey1", "repo1-s3-key-secret=verySecretKey1", "repo1-s3-region=us-east-1", @@ -8630,19 +8604,6 @@ ] } }, - { - "key" : { - "bash-wrap" : true, - "cmd" : [ - "echo \"172.17.0.3 demo-bucket.s3.amazonaws.com s3.amazonaws.com\" | tee -a /etc/hosts" - ], - "host" : "pg-primary", - "load-env" : true, - "output" : false, - "run-as-user" : "root" - }, - "type" : "exe" - }, { "key" : { "bash-wrap" : true, @@ -8664,7 +8625,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -8691,17 +8652,17 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=4 --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo --start-fast --stop-auto", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=4 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo --start-fast --stop-auto", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:12:53\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000070000000000000019, lsn = 0/19000028", + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:55:32\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 00000007000000000000001C, lsn = 0/1C000028", " [filtered 1119 lines of output]", - "P02 INFO: backup file /var/lib/pgsql/9.5/data/base/1/12216 (0B, 100%)", + "P03 INFO: backup file /var/lib/pgsql/9.5/data/base/1/12216 (0B, 100%)", "P04 INFO: backup file /var/lib/pgsql/9.5/data/base/1/12211 (0B, 100%)", "P00 INFO: full backup size = 27.2MB", "P00 INFO: execute exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: backup stop archive = 000000070000000000000019, lsn = 0/19000130", - " [filtered 4 lines of output]" + "P00 INFO: backup stop archive = 00000007000000000000001C, lsn = 0/1C000130", + " [filtered 5 lines of output]" ] } }, @@ -8739,7 +8700,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stop command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stop command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stop command end: completed successfully" ] } @@ -8765,7 +8726,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-delete command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-delete command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-delete command end: completed successfully" ] } @@ -8827,7 +8788,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "repository", @@ -9412,18 +9373,18 @@ " cipher: none", "", " db (current)", - " wal archive min/max (9.5-1): 000000080000000000000020/000000080000000000000021", + " wal archive min/max (9.5-1): 000000080000000000000023/000000080000000000000025", "", - " full backup: 20190520-141421F", - " timestamp start/stop: 2019-05-20 14:14:21 / 2019-05-20 14:14:35", - " wal start/stop: 000000080000000000000020 / 000000080000000000000020", - " database size: 27.2MB, backup size: 27.2MB", + " full backup: 20190625-015707F", + " timestamp start/stop: 2019-06-25 01:57:07 / 2019-06-25 01:57:25", + " wal start/stop: 000000080000000000000023 / 000000080000000000000023", + " database size: 27.3MB, backup size: 27.3MB", " repository size: 3.2MB, repository backup size: 3.2MB", "", - " full backup: 20190520-141437F", - " timestamp start/stop: 2019-05-20 14:14:37 / 2019-05-20 14:14:48", - " wal start/stop: 000000080000000000000021 / 000000080000000000000021", - " database size: 27.2MB, backup size: 27.2MB", + " full backup: 20190625-015728F", + " timestamp start/stop: 2019-06-25 01:57:28 / 2019-06-25 01:57:36", + " wal start/stop: 000000080000000000000025 / 000000080000000000000025", + " database size: 27.3MB, backup size: 27.3MB", " repository size: 3.2MB, repository backup size: 3.2MB" ] } @@ -9568,7 +9529,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-standby", @@ -9972,12 +9933,12 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:14:38 UTC", + "LOG: database system was interrupted; last known up at 2019-06-25 01:57:29 UTC", "LOG: entering standby mode", "LOG: restored log file \"00000008.history\" from archive", - "LOG: restored log file \"000000080000000000000021\" from archive", - "LOG: redo starts at 0/21000028", - "LOG: consistent recovery state reached at 0/21000130", + "LOG: restored log file \"000000080000000000000025\" from archive", + "LOG: redo starts at 0/25000028", + "LOG: consistent recovery state reached at 0/250000F8", "LOG: database system is ready to accept read only connections" ] } @@ -10059,7 +10020,7 @@ "output" : [ " pg_switch_xlog | now ", "----------------+-------------------------------", - " 0/2201FBB0 | 2019-05-20 14:15:26.561117+00", + " 0/2601F408 | 2019-06-25 01:58:27.705598+00", "(1 row)" ] } @@ -10088,7 +10049,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:15:27.717356+00", + " Important Data | 2019-06-25 01:58:33.389552+00", "(1 row)" ] } @@ -10114,7 +10075,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-host=repository --stanza=demo", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-host=repository --stanza=demo", "P00 INFO: switch xlog cannot be performed on the standby, all other checks passed successfully", "P00 INFO: check command end: completed successfully" ] @@ -10352,8 +10313,8 @@ "output" : [ " [filtered 6 lines of output]", "LOG: database system is ready to accept read only connections", - "LOG: restored log file \"000000080000000000000022\" from archive", - "LOG: started streaming WAL from primary at 0/23000000 on timeline 8" + "LOG: restored log file \"000000080000000000000026\" from archive", + "LOG: started streaming WAL from primary at 0/27000000 on timeline 8" ] } }, @@ -10385,7 +10346,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:15:41.776654+00", + " Important Data | 2019-06-25 01:58:50.842981+00", "(1 row)" ] } @@ -10414,7 +10375,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:15:42.167785+00", + " Important Data | 2019-06-25 01:58:51.555622+00", "(1 row)" ] } @@ -10646,8 +10607,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-host=repository --stanza=demo", - "P00 INFO: WAL segment 000000080000000000000028 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.5-1/0000000800000000/000000080000000000000028-39badc6b96e9b2ff0602efdbca2438276600c927.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --repo1-host=repository --stanza=demo", + "P00 INFO: WAL segment 00000008000000000000002C successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.5-1/0000000800000000/00000008000000000000002C-690245e836623931c67b800e4553236149bc1d26.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -10674,24 +10635,25 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000023", - "P01 DETAIL: pushed WAL file '000000080000000000000023' to the archive", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000027", + "P01 DETAIL: pushed WAL file '000000080000000000000027' to the archive", "P00 INFO: archive-push-async command end: completed successfully", "", "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 4 WAL file(s) to archive: 000000080000000000000024...000000080000000000000027", - "P01 DETAIL: pushed WAL file '000000080000000000000024' to the archive", - "P02 DETAIL: pushed WAL file '000000080000000000000025' to the archive", - "P01 DETAIL: pushed WAL file '000000080000000000000026' to the archive", - "P02 DETAIL: pushed WAL file '000000080000000000000027' to the archive", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 4 WAL file(s) to archive: 000000080000000000000028...00000008000000000000002B", + "P02 DETAIL: pushed WAL file '000000080000000000000029' to the archive", + "P01 DETAIL: pushed WAL file '000000080000000000000028' to the archive", + "P02 DETAIL: pushed WAL file '00000008000000000000002A' to the archive", + "P01 DETAIL: pushed WAL file '00000008000000000000002B' to the archive", "P00 INFO: archive-push-async command end: completed successfully", "", "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000028", - "P01 DETAIL: pushed WAL file '000000080000000000000028' to the archive" + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.5/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: push 1 WAL file(s) to archive: 00000008000000000000002C", + "P01 DETAIL: pushed WAL file '00000008000000000000002C' to the archive", + "P00 INFO: archive-push-async command end: completed successfully" ] } }, @@ -10730,23 +10692,23 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-get-async command begin 2.14: [000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000021...000000080000000000000028", - "P01 DETAIL: found 000000080000000000000021 in the archive", - "P02 DETAIL: found 000000080000000000000022 in the archive", - "P01 DETAIL: unable to find 000000080000000000000023 in the archive", - "P02 DETAIL: unable to find 000000080000000000000024 in the archive", + "P00 INFO: archive-get-async command begin 2.15: [000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028, 000000080000000000000029, 00000008000000000000002A, 00000008000000000000002B, 00000008000000000000002C] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000025...00000008000000000000002C", + "P01 DETAIL: found 000000080000000000000025 in the archive", + "P02 DETAIL: found 000000080000000000000026 in the archive", + "P01 DETAIL: unable to find 000000080000000000000027 in the archive", + "P02 DETAIL: unable to find 000000080000000000000028 in the archive", " [filtered 20 lines of output]", - "P00 INFO: archive-get-async command begin 2.14: [000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028, 000000080000000000000029, 00000008000000000000002A] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", - "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000023...00000008000000000000002A", - "P02 DETAIL: found 000000080000000000000024 in the archive", - "P01 DETAIL: found 000000080000000000000023 in the archive", - "P02 DETAIL: found 000000080000000000000025 in the archive", - "P01 DETAIL: found 000000080000000000000026 in the archive", + "P00 INFO: archive-get-async command begin 2.15: [000000080000000000000027, 000000080000000000000028, 000000080000000000000029, 00000008000000000000002A, 00000008000000000000002B, 00000008000000000000002C, 00000008000000000000002D, 00000008000000000000002E] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.5/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000027...00000008000000000000002E", "P01 DETAIL: found 000000080000000000000027 in the archive", "P02 DETAIL: found 000000080000000000000028 in the archive", - "P01 DETAIL: unable to find 000000080000000000000029 in the archive", - "P02 DETAIL: unable to find 00000008000000000000002A in the archive", + "P01 DETAIL: found 000000080000000000000029 in the archive", + "P02 DETAIL: found 00000008000000000000002A in the archive", + "P01 DETAIL: found 00000008000000000000002B in the archive", + "P02 DETAIL: found 00000008000000000000002C in the archive", + "P01 DETAIL: unable to find 00000008000000000000002D in the archive", + "P02 DETAIL: unable to find 00000008000000000000002E in the archive", " [filtered 13 lines of output]" ] } @@ -10829,19 +10791,23 @@ "value" : { "output" : [ " [filtered 2 lines of output]", - "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:15:59\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 00000008000000000000002A, lsn = 0/2A000028", - "P00 INFO: wait for replay on the standby to reach 0/2A000028", - "P00 INFO: replay on the standby reached 0/2A0000D0", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/global/pg_control (8KB, 0%) checksum 43995b7db6a172999f45d0538f708fd474c75411", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/pg_log/postgresql.log (7.6KB, 0%) checksum 731ca3bfd7d252b7a5125a0c7e9d975b49757d41", - "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/1249 (360KB, 17%) checksum 7aed48a6bc5e3d132c1ae5f50788f75f71d91554", - "P04 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2674 (352KB, 34%) checksum 69173fcb28bb28f341e388a78017d3c5ab0b1ca0", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/pg_hba.conf (4.1KB, 34%) checksum 1c0bca2f7f44d354aaaefb2c21fd1290b7379690", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/backup_label (238B, 34%) checksum cefe741459a70958b37f38f49a1c7297cc7780f1", - "P02 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2608 (432KB, 54%) checksum 242ea7f2edea85d948c63fe971309c6953b5ecde", - "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2673 (304KB, 68%) checksum b27b452c687659fef39ae51922abda16e7a9b2b9", - " [filtered 34 lines of output]" + "P00 INFO: execute exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:59:12\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 00000008000000000000002E, lsn = 0/2E000028", + "P00 INFO: wait for replay on the standby to reach 0/2E000028", + "P00 INFO: replay on the standby reached 0/2E0000D0", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/pg_log/postgresql.log (8.2KB, 0%) checksum 29c668523d17144b554b47c9a3af96bc59557345", + "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2674 (360KB, 17%) checksum 9f98c59fd7fd8d79f2b470d0eb0ddf8bce495b33", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/global/pg_control (8KB, 17%) checksum 0d9cf6846b76c96bf3e0ba792808d56213e68a15", + "P02 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2608 (432KB, 37%) checksum 944bc47b45ba0f9602a74bfd9d30855f23076414", + "P04 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/1249 (360KB, 54%) checksum e5426f89282b1c6841bd9ff4815a8d2bc862ffa6", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/pg_hba.conf (4.1KB, 54%) checksum 1c0bca2f7f44d354aaaefb2c21fd1290b7379690", + "P02 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2658 (112KB, 59%) checksum 4d7b0996d87f4df06c7a7b06c37dd0fa39f810c4", + "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2673 (312KB, 74%) checksum b1875b8baa04f94c7b88a92968ad10ceb438e474", + "P04 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/1259 (104KB, 78%) checksum b6f3100edc560fed6024f08b50a1d6b4d37999dd", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.5/data/backup_label (238B, 78%) checksum 1b94dc6ccfaaf6913ede73eb5f9dd58c3ce18c5f", + "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/1247 (72KB, 82%) checksum b58edbf0e7bc8f10c490f3c8744626aa2670e401", + "P04 INFO: backup file pg-standby:/var/lib/pgsql/9.5/data/base/12378/2704 (40KB, 84%) checksum 231ecdeec7698b51062d2804dcd0265bb4dc3db0", + " [filtered 30 lines of output]" ] } }, @@ -11104,7 +11070,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-upgrade command begin 2.14: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/pgsql/9.6/data --pg2-path=/var/lib/pgsql/9.6/data --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-upgrade command begin 2.15: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/pgsql/9.6/data --pg2-path=/var/lib/pgsql/9.6/data --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-upgrade command end: completed successfully" ] } @@ -11141,7 +11107,7 @@ "type" : "exe", "value" : { "output" : [ - "postgresql-9.6 (pid 4849) is running..." + "postgresql-9.6 (pid 4887) is running..." ] } }, @@ -11328,6 +11294,21 @@ "{\"os-type\":\"centos7\"}" : { "all" : { "user-guide" : [ + { + "key" : { + "id" : "s3", + "image" : "minio/minio:RELEASE.2019-06-04T01-15-58Z", + "name" : "s3-server", + "option" : "-v {[host-repo-path]}/doc/resource/fake-cert/s3-server.crt:/root/.minio/certs/public.crt:ro -v {[host-repo-path]}/doc/resource/fake-cert/s3-server.key:/root/.minio/certs/private.key:ro -e MINIO_REGION=us-east-1 -e MINIO_DOMAIN=s3.us-east-1.amazonaws.com -e MINIO_BROWSER=off -e MINIO_ACCESS_KEY=accessKey1 -e MINIO_SECRET_KEY=verySecretKey1", + "os" : "centos7", + "param" : "server /data --address :443 --compat", + "update-hosts" : false + }, + "type" : "host", + "value" : { + "ip" : "172.17.0.2" + } + }, { "key" : { "id" : "build", @@ -11339,14 +11320,14 @@ }, "type" : "host", "value" : { - "ip" : "172.17.0.2" + "ip" : "172.17.0.3" } }, { "key" : { "bash-wrap" : true, "cmd" : [ - "sudo mkdir /root/pgbackrest-release-2.14" + "sudo mkdir /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -11359,7 +11340,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/libc /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -11372,7 +11353,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.14" + "sudo cp -r /pgbackrest/src /root/pgbackrest-release-2.15" ], "host" : "build", "load-env" : true, @@ -11418,7 +11399,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "(cd /root/pgbackrest-release-2.14/src && ./configure)" + "(cd /root/pgbackrest-release-2.15/src && ./configure)" ], "host" : "build", "load-env" : true, @@ -11431,7 +11412,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo make -s -C /root/pgbackrest-release-2.14/src" + "sudo make -s -C /root/pgbackrest-release-2.15/src" ], "host" : "build", "load-env" : true, @@ -11440,19 +11421,6 @@ }, "type" : "exe" }, - { - "key" : { - "id" : "s3", - "image" : "pgbackrest/test:s3-server-20180612A", - "name" : "s3-server", - "os" : "centos7", - "update-hosts" : true - }, - "type" : "host", - "value" : { - "ip" : "172.17.0.3" - } - }, { "key" : { "id" : "pg1", @@ -11471,7 +11439,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-primary", @@ -11613,7 +11581,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - General help", + "pgBackRest 2.15 - General help", "", "Usage:", " pgbackrest [options] [command]", @@ -11757,7 +11725,7 @@ "type" : "exe", "value" : { "output" : [ - "pgBackRest 2.14 - 'backup' command - 'log-path' option help", + "pgBackRest 2.15 - 'backup' command - 'log-path' option help", "", "Path where log files are stored.", "", @@ -11846,7 +11814,7 @@ "value" : "3" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -11859,7 +11827,7 @@ "log_filename = 'postgresql.log'", "log_line_prefix = ''", "max_wal_senders = 3", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -11995,7 +11963,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -12021,8 +11989,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", - "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.6-1/0000000100000000/000000010000000000000001-5f21a10d1f6b79b65148ebfe7440769cca067b6d.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: WAL segment 000000010000000000000001 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.6-1/0000000100000000/000000010000000000000001-950df57b860fa827a4b4d20dbd0717976f07504e.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -12049,9 +12017,9 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:02:08\": backup begins after the next regular checkpoint completes", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:43:23\": backup begins after the next regular checkpoint completes", "P00 INFO: backup start archive = 000000010000000000000002, lsn = 0/2000028", " [filtered 864 lines of output]", "P01 INFO: backup file /var/lib/pgsql/9.6/data/base/1/12312 (0B, 100%)", @@ -12067,7 +12035,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -12077,7 +12045,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140208F" + "20190625-014323F" ] } }, @@ -12105,7 +12073,7 @@ "output" : [ " [filtered 3 lines of output]", "P00 INFO: backup start archive = 000000010000000000000003, lsn = 0/3000028", - "P01 INFO: backup file /var/lib/pgsql/9.6/data/global/pg_control (8KB, 100%) checksum 30fc17beaf75ada7caf389886b7534a996d52a2d", + "P01 INFO: backup file /var/lib/pgsql/9.6/data/global/pg_control (8KB, 100%) checksum db2865c02e0b7e6443868fd03edadaa3954a1d51", "P00 INFO: diff backup size = 8KB", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", "P00 INFO: backup stop archive = 000000010000000000000003, lsn = 0/30000F8", @@ -12141,18 +12109,18 @@ " db (current)", " wal archive min/max (9.6-1): 000000010000000000000002/000000010000000000000003", "", - " full backup: 20190520-140208F", - " timestamp start/stop: 2019-05-20 14:02:08 / 2019-05-20 14:02:21", + " full backup: 20190625-014323F", + " timestamp start/stop: 2019-06-25 01:43:23 / 2019-06-25 01:43:35", " wal start/stop: 000000010000000000000002 / 000000010000000000000002", - " database size: 21.0MB, backup size: 21.0MB", + " database size: 20.9MB, backup size: 20.9MB", " repository size: 2.5MB, repository backup size: 2.5MB", "", - " diff backup: 20190520-140208F_20190520-140222D", - " timestamp start/stop: 2019-05-20 14:02:22 / 2019-05-20 14:02:25", + " diff backup: 20190625-014323F_20190625-014336D", + " timestamp start/stop: 2019-06-25 01:43:36 / 2019-06-25 01:43:39", " wal start/stop: 000000010000000000000003 / 000000010000000000000003", - " database size: 21.0MB, backup size: 8.2KB", + " database size: 20.9MB, backup size: 8.2KB", " repository size: 2.5MB, repository backup size: 421B", - " backup reference list: 20190520-140208F" + " backup reference list: 20190625-014323F" ] } }, @@ -12219,11 +12187,11 @@ "value" : { "output" : [ " [filtered 8 lines of output]", - "May 20 14:02:26 pg-primary systemd[1]: Starting PostgreSQL 9.6 database server...", - "May 20 14:02:26 pg-primary systemd[1]: postgresql-9.6.service: main process exited, code=exited, status=2/INVALIDARGUMENT", - "May 20 14:02:26 pg-primary systemd[1]: Failed to start PostgreSQL 9.6 database server.", - "May 20 14:02:26 pg-primary systemd[1]: Unit postgresql-9.6.service entered failed state.", - "May 20 14:02:26 pg-primary systemd[1]: postgresql-9.6.service failed." + "Jun 25 01:43:41 pg-primary systemd[1]: Starting PostgreSQL 9.6 database server...", + "Jun 25 01:43:41 pg-primary systemd[1]: postgresql-9.6.service: main process exited, code=exited, status=2/INVALIDARGUMENT", + "Jun 25 01:43:41 pg-primary systemd[1]: Failed to start PostgreSQL 9.6 database server.", + "Jun 25 01:43:41 pg-primary systemd[1]: Unit postgresql-9.6.service entered failed state.", + "Jun 25 01:43:41 pg-primary systemd[1]: postgresql-9.6.service failed." ] } }, @@ -12301,9 +12269,9 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", - "P00 INFO: last backup label = 20190520-140208F_20190520-140222D, version = 2.14", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:02:39\": backup begins after the next regular checkpoint completes", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --type=incr", + "P00 INFO: last backup label = 20190625-014323F_20190625-014336D, version = 2.15", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:43:55\": backup begins after the next regular checkpoint completes", "P00 INFO: backup start archive = 000000020000000000000005, lsn = 0/5000028", "P00 WARN: a timeline switch has occurred since the last backup, enabling delta checksum", " [filtered 9 lines of output]" @@ -12362,11 +12330,11 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", - "P00 INFO: last backup label = 20190520-140208F_20190520-140239I, version = 2.14", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:02:44\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-full=2 --stanza=demo --start-fast --type=incr", + "P00 INFO: last backup label = 20190625-014323F_20190625-014355I, version = 2.15", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:44:01\": backup begins after the requested immediate checkpoint completes", "P00 INFO: backup start archive = 000000020000000000000006, lsn = 0/6000028", - "P01 INFO: backup file /var/lib/pgsql/9.6/data/global/pg_control (8KB, 100%) checksum 245d34e7de56b6826c0338492a7c177fb699eb93", + "P01 INFO: backup file /var/lib/pgsql/9.6/data/global/pg_control (8KB, 100%) checksum faa4883811ea5e218d29407b0aed84a17a3b44e3", " [filtered 7 lines of output]" ] } @@ -12405,25 +12373,25 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", " },", " \"info\" : {", - " \"delta\" : 22002120,", + " \"delta\" : 21952964,", " \"repository\" : {", - " \"delta\" : 2581653,", - " \"size\" : 2581653", + " \"delta\" : 2581349,", + " \"size\" : 2581349", " },", - " \"size\" : 22002120", + " \"size\" : 21952964", " },", - " \"label\" : \"20190520-140208F\",", + " \"label\" : \"20190625-014323F\",", " \"prior\" : null,", " \"reference\" : null,", " \"timestamp\" : {", - " \"start\" : 1558360928,", - " \"stop\" : 1558360941", + " \"start\" : 1561427003,", + " \"stop\" : 1561427015", " },", " \"type\" : \"full\"", " },", @@ -12434,7 +12402,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -12443,18 +12411,18 @@ " \"delta\" : 8421,", " \"repository\" : {", " \"delta\" : 421,", - " \"size\" : 2581653", + " \"size\" : 2581333", " },", - " \"size\" : 22002120", + " \"size\" : 21952964", " },", - " \"label\" : \"20190520-140208F_20190520-140222D\",", - " \"prior\" : \"20190520-140208F\",", + " \"label\" : \"20190625-014323F_20190625-014336D\",", + " \"prior\" : \"20190625-014323F\",", " \"reference\" : [", - " \"20190520-140208F\"", + " \"20190625-014323F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558360942,", - " \"stop\" : 1558360945", + " \"start\" : 1561427016,", + " \"stop\" : 1561427019", " },", " \"type\" : \"diff\"", " },", @@ -12465,7 +12433,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -12474,18 +12442,18 @@ " \"delta\" : 9341,", " \"repository\" : {", " \"delta\" : 837,", - " \"size\" : 2581797", + " \"size\" : 2581477", " },", - " \"size\" : 22002688", + " \"size\" : 21953532", " },", - " \"label\" : \"20190520-140208F_20190520-140239I\",", - " \"prior\" : \"20190520-140208F_20190520-140222D\",", + " \"label\" : \"20190625-014323F_20190625-014355I\",", + " \"prior\" : \"20190625-014323F_20190625-014336D\",", " \"reference\" : [", - " \"20190520-140208F\"", + " \"20190625-014323F\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558360959,", - " \"stop\" : 1558360963", + " \"start\" : 1561427035,", + " \"stop\" : 1561427039", " },", " \"type\" : \"incr\"", " },", @@ -12496,7 +12464,7 @@ " },", " \"backrest\" : {", " \"format\" : 5,", - " \"version\" : \"2.14\"", + " \"version\" : \"2.15\"", " },", " \"database\" : {", " \"id\" : 1", @@ -12505,19 +12473,19 @@ " \"delta\" : 8421,", " \"repository\" : {", " \"delta\" : 421,", - " \"size\" : 2581797", + " \"size\" : 2581477", " },", - " \"size\" : 22002688", + " \"size\" : 21953532", " },", - " \"label\" : \"20190520-140208F_20190520-140244I\",", - " \"prior\" : \"20190520-140208F_20190520-140239I\",", + " \"label\" : \"20190625-014323F_20190625-014401I\",", + " \"prior\" : \"20190625-014323F_20190625-014355I\",", " \"reference\" : [", - " \"20190520-140208F\",", - " \"20190520-140208F_20190520-140239I\"", + " \"20190625-014323F\",", + " \"20190625-014323F_20190625-014355I\"", " ],", " \"timestamp\" : {", - " \"start\" : 1558360964,", - " \"stop\" : 1558360968", + " \"start\" : 1561427041,", + " \"stop\" : 1561427044", " },", " \"type\" : \"incr\"", " }", @@ -12526,7 +12494,7 @@ " \"db\" : [", " {", " \"id\" : 1,", - " \"system-id\" : 6693109148669313339,", + " \"system-id\" : 6706277820808323406,", " \"version\" : \"9.6\"", " }", " ],", @@ -12681,7 +12649,7 @@ "output" : [ " name | last_successful_backup | last_archived_wal ", "--------+------------------------+--------------------------", - " \"demo\" | 2019-05-20 14:02:48+00 | 000000020000000000000006", + " \"demo\" | 2019-06-25 01:44:04+00 | 000000020000000000000006", "(1 row)" ] } @@ -12727,7 +12695,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-140208F|remove archive" + "archive retention on backup 20190625-014323F|remove archive" ] }, "host" : "pg-primary", @@ -12741,7 +12709,7 @@ " [filtered 874 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 DETAIL: archive retention on backup 20190520-140208F, archiveId = 9.6-1, start = 000000010000000000000002", + "P00 DETAIL: archive retention on backup 20190625-014323F, archiveId = 9.6-1, start = 000000010000000000000002", "P00 DETAIL: no archive to remove, archiveId = 9.6-1", "P00 INFO: expire command end: completed successfully" ] @@ -12751,7 +12719,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -12761,7 +12729,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140252F" + "20190625-014409F" ] } }, @@ -12776,7 +12744,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire full backup set\\: 20190520-140208F|archive retention on backup 20190520-140252F|remove archive" + "expire full backup set\\: 20190625-014323F|archive retention on backup 20190625-014409F|remove archive" ] }, "host" : "pg-primary", @@ -12790,9 +12758,9 @@ " [filtered 873 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire full backup set: 20190520-140208F, 20190520-140208F_20190520-140222D, 20190520-140208F_20190520-140239I, 20190520-140208F_20190520-140244I", - "P00 INFO: remove expired backup 20190520-140208F_20190520-140244I", - "P00 INFO: remove expired backup 20190520-140208F_20190520-140239I", + "P00 INFO: expire full backup set: 20190625-014323F, 20190625-014323F_20190625-014336D, 20190625-014323F_20190625-014355I, 20190625-014323F_20190625-014401I", + "P00 INFO: remove expired backup 20190625-014323F_20190625-014401I", + "P00 INFO: remove expired backup 20190625-014323F_20190625-014355I", " [filtered 2 lines of output]" ] } @@ -12845,7 +12813,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -12855,7 +12823,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140306F_20190520-140320D" + "20190625-014423F_20190625-014437D" ] } }, @@ -12883,7 +12851,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "expire diff backup set: 20190520-140306F_20190520-140320D" + "expire diff backup set: 20190625-014423F_20190625-014437D" ] }, "host" : "pg-primary", @@ -12897,9 +12865,9 @@ " [filtered 9 lines of output]", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin", - "P00 INFO: expire diff backup set: 20190520-140306F_20190520-140320D, 20190520-140306F_20190520-140324I", - "P00 INFO: remove expired backup 20190520-140306F_20190520-140324I", - "P00 INFO: remove expired backup 20190520-140306F_20190520-140320D" + "P00 INFO: expire diff backup set: 20190625-014423F_20190625-014437D, 20190625-014423F_20190625-014442I", + "P00 INFO: remove expired backup 20190625-014423F_20190625-014442I", + "P00 INFO: remove expired backup 20190625-014423F_20190625-014437D" ] } }, @@ -12938,7 +12906,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -12948,7 +12916,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140306F_20190520-140328D" + "20190625-014423F_20190625-014447D" ] } }, @@ -12989,10 +12957,10 @@ "type" : "exe", "value" : { "output" : [ - " [filtered 7 lines of output]", + " [filtered 8 lines of output]", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: backup stop archive = 00000002000000000000000F, lsn = 0/F0000F8", - "P00 INFO: new backup label = 20190520-140306F_20190520-140333D", + "P00 INFO: backup stop archive = 000000020000000000000011, lsn = 0/110000F8", + "P00 INFO: new backup label = 20190625-014423F_20190625-014453D", "P00 INFO: backup command end: completed successfully", "P00 INFO: expire command begin" ] @@ -13002,7 +12970,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -13012,7 +12980,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140306F_20190520-140333D" + "20190625-014423F_20190625-014453D" ] } }, @@ -13027,7 +12995,7 @@ "filter" : true, "filter-context" : 2, "list" : [ - "archive retention on backup 20190520-140306F_20190520-140328D|remove archive" + "archive retention on backup 20190625-014423F_20190625-014447D|remove archive" ] }, "host" : "pg-primary", @@ -13038,13 +13006,14 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: expire command begin 2.14: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", - "P00 DETAIL: archive retention on backup 20190520-140252F, archiveId = 9.6-1, start = 000000020000000000000008, stop = 000000020000000000000008", - "P00 DETAIL: archive retention on backup 20190520-140306F, archiveId = 9.6-1, start = 000000020000000000000009, stop = 000000020000000000000009", - "P00 DETAIL: archive retention on backup 20190520-140306F_20190520-140328D, archiveId = 9.6-1, start = 00000002000000000000000C, stop = 00000002000000000000000C", - "P00 DETAIL: archive retention on backup 20190520-140306F_20190520-140333D, archiveId = 9.6-1, start = 00000002000000000000000F", - "P00 DETAIL: remove archive: archiveId = 9.6-1, start = 00000002000000000000000A, stop = 00000002000000000000000B", - "P00 DETAIL: remove archive: archiveId = 9.6-1, start = 00000002000000000000000D, stop = 00000002000000000000000E", + "P00 INFO: expire command begin 2.15: --log-level-console=detail --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/var/lib/pgbackrest --repo1-retention-archive=1 --repo1-retention-archive-type=diff --repo1-retention-diff=2 --repo1-retention-full=2 --stanza=demo", + "P00 DETAIL: archive retention on backup 20190625-014409F, archiveId = 9.6-1, start = 000000020000000000000008, stop = 000000020000000000000008", + "P00 DETAIL: archive retention on backup 20190625-014423F, archiveId = 9.6-1, start = 00000002000000000000000A, stop = 00000002000000000000000A", + "P00 DETAIL: archive retention on backup 20190625-014423F_20190625-014447D, archiveId = 9.6-1, start = 00000002000000000000000E, stop = 00000002000000000000000E", + "P00 DETAIL: archive retention on backup 20190625-014423F_20190625-014453D, archiveId = 9.6-1, start = 000000020000000000000011", + "P00 DETAIL: remove archive: archiveId = 9.6-1, start = 000000020000000000000009, stop = 000000020000000000000009", + "P00 DETAIL: remove archive: archiveId = 9.6-1, start = 00000002000000000000000B, stop = 00000002000000000000000D", + "P00 DETAIL: remove archive: archiveId = 9.6-1, start = 00000002000000000000000F, stop = 000000020000000000000010", "P00 INFO: expire command end: completed successfully" ] } @@ -13084,7 +13053,7 @@ "type" : "exe", "value" : { "output" : [ - " [filtered 893 lines of output]", + " [filtered 891 lines of output]", "P01 DETAIL: restore file /var/lib/pgsql/9.6/data/base/1/12307 - exists and is zero size (0B, 100%)", "P00 INFO: write /var/lib/pgsql/9.6/data/recovery.conf", "P00 INFO: restore global/pg_control (performed last to ensure aborted restores cannot be started)", @@ -13467,7 +13436,7 @@ "type" : "exe", "value" : { "output" : [ - "2019-05-20 14:04:13.516529+00" + "2019-06-25 01:45:33.362422+00" ] } }, @@ -13520,7 +13489,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:04:13.516529+00\" \\", + " --type=time \"--target=2019-06-25 01:45:33.362422+00\" \\", " --target-action=promote restore" ], "host" : "pg-primary", @@ -13565,7 +13534,7 @@ "value" : { "output" : [ "restore_command = 'pgbackrest --stanza=demo archive-get %f \"%p\"'", - "recovery_target_time = '2019-05-20 14:04:13.516529+00'", + "recovery_target_time = '2019-06-25 01:45:33.362422+00'", "recovery_target_action = 'promote'" ] } @@ -13645,16 +13614,16 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:04:05 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:04:13.516529+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:45:26 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:45:33.362422+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000015\" from archive", - "LOG: redo starts at 0/15000028", - "LOG: consistent recovery state reached at 0/150000F8", "LOG: restored log file \"000000040000000000000016\" from archive", - "LOG: recovery stopping before commit of transaction 639, time 2019-05-20 14:04:13.778722+00", - "LOG: redo done at 0/160203B0", - "LOG: last completed transaction was at log time 2019-05-20 14:04:13.250355+00", + "LOG: redo starts at 0/16000028", + "LOG: consistent recovery state reached at 0/160000F8", + "LOG: restored log file \"000000040000000000000017\" from archive", + "LOG: recovery stopping before commit of transaction 639, time 2019-06-25 01:45:33.807831+00", + "LOG: redo done at 0/17020CA8", + "LOG: last completed transaction was at log time 2019-06-25 01:45:32.937199+00", "LOG: selected new timeline ID: 5", "LOG: archive recovery complete", " [filtered 3 lines of output]" @@ -13696,7 +13665,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo -u postgres ls -1 /var/lib/pgbackrest/backup/demo | tail -5 | head -1" + "sudo -u postgres pgbackrest ls backup/demo --filter=\"(F|D|I)$\" --sort=desc | head -1" ], "host" : "pg-primary", "load-env" : true, @@ -13706,7 +13675,7 @@ "type" : "exe", "value" : { "output" : [ - "20190520-140306F_20190520-140404D" + "20190625-014423F_20190625-014525D" ] } }, @@ -13741,7 +13710,7 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:04:13.516529+00\" --target-action=promote restore" + " --type=time \"--target=2019-06-25 01:45:33.362422+00\" --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -13838,14 +13807,14 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:04:22 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:04:13.516529+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:45:43 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:45:33.362422+00", "LOG: restored log file \"00000005.history\" from archive", - "LOG: restored log file \"000000050000000000000017\" from archive", - "LOG: redo starts at 0/17000028", - "LOG: consistent recovery state reached at 0/170000F8", - "LOG: redo done at 0/170000F8", - "LOG: restored log file \"000000050000000000000017\" from archive", + "LOG: restored log file \"000000050000000000000018\" from archive", + "LOG: redo starts at 0/18000028", + "LOG: consistent recovery state reached at 0/180000F8", + "LOG: redo done at 0/180000F8", + "LOG: restored log file \"000000050000000000000018\" from archive", " [filtered 7 lines of output]" ] } @@ -13860,7 +13829,7 @@ "filter" : false, "filter-context" : 2, "list" : [ - "20190520-140306F_20190520-140404D" + "20190625-014423F_20190625-014525D" ] }, "host" : "pg-primary", @@ -13876,47 +13845,47 @@ " cipher: aes-256-cbc", "", " db (current)", - " wal archive min/max (9.6-1): 000000020000000000000008/000000050000000000000017", + " wal archive min/max (9.6-1): 000000020000000000000008/000000050000000000000018", "", - " full backup: 20190520-140252F", - " timestamp start/stop: 2019-05-20 14:02:52 / 2019-05-20 14:03:05", + " full backup: 20190625-014409F", + " timestamp start/stop: 2019-06-25 01:44:09 / 2019-06-25 01:44:22", " wal start/stop: 000000020000000000000008 / 000000020000000000000008", - " database size: 21.0MB, backup size: 21.0MB", + " database size: 20.9MB, backup size: 20.9MB", " repository size: 2.5MB, repository backup size: 2.5MB", "", - " full backup: 20190520-140306F", - " timestamp start/stop: 2019-05-20 14:03:06 / 2019-05-20 14:03:18", - " wal start/stop: 000000020000000000000009 / 000000020000000000000009", - " database size: 21.0MB, backup size: 21.0MB", + " full backup: 20190625-014423F", + " timestamp start/stop: 2019-06-25 01:44:23 / 2019-06-25 01:44:35", + " wal start/stop: 00000002000000000000000A / 00000002000000000000000A", + " database size: 20.9MB, backup size: 20.9MB", " repository size: 2.5MB, repository backup size: 2.5MB", "", - " diff backup: 20190520-140306F_20190520-140333D", - " timestamp start/stop: 2019-05-20 14:03:33 / 2019-05-20 14:03:37", - " wal start/stop: 00000002000000000000000F / 00000002000000000000000F", - " database size: 21.0MB, backup size: 9.6KB", - " repository size: 2.5MB, repository backup size: 901B", - " backup reference list: 20190520-140306F", + " diff backup: 20190625-014423F_20190625-014453D", + " timestamp start/stop: 2019-06-25 01:44:53 / 2019-06-25 01:44:56", + " wal start/stop: 000000020000000000000011 / 000000020000000000000011", + " database size: 20.9MB, backup size: 97.6KB", + " repository size: 2.5MB, repository backup size: 11.8KB", + " backup reference list: 20190625-014423F", "", - " incr backup: 20190520-140306F_20190520-140344I", - " timestamp start/stop: 2019-05-20 14:03:44 / 2019-05-20 14:03:55", - " wal start/stop: 000000030000000000000012 / 000000030000000000000012", - " database size: 34.6MB, backup size: 13.8MB", + " incr backup: 20190625-014423F_20190625-014504I", + " timestamp start/stop: 2019-06-25 01:45:04 / 2019-06-25 01:45:14", + " wal start/stop: 000000030000000000000013 / 000000030000000000000013", + " database size: 34.6MB, backup size: 13.7MB", " repository size: 4MB, repository backup size: 1.6MB", - " backup reference list: 20190520-140306F", + " backup reference list: 20190625-014423F, 20190625-014423F_20190625-014453D", "", - " diff backup: 20190520-140306F_20190520-140404D", - " timestamp start/stop: 2019-05-20 14:04:04 / 2019-05-20 14:04:12", - " wal start/stop: 000000040000000000000015 / 000000040000000000000015", + " diff backup: 20190625-014423F_20190625-014525D", + " timestamp start/stop: 2019-06-25 01:45:25 / 2019-06-25 01:45:32", + " wal start/stop: 000000040000000000000016 / 000000040000000000000016", " database size: 27.8MB, backup size: 7.0MB", - " repository size: 3.3MB, repository backup size: 846KB", - " backup reference list: 20190520-140306F", + " repository size: 3.3MB, repository backup size: 846.8KB", + " backup reference list: 20190625-014423F", "", - " incr backup: 20190520-140306F_20190520-140421I", - " timestamp start/stop: 2019-05-20 14:04:21 / 2019-05-20 14:04:25", - " wal start/stop: 000000050000000000000017 / 000000050000000000000017", - " database size: 27.8MB, backup size: 2MB", + " incr backup: 20190625-014423F_20190625-014542I", + " timestamp start/stop: 2019-06-25 01:45:42 / 2019-06-25 01:45:47", + " wal start/stop: 000000050000000000000018 / 000000050000000000000018", + " database size: 27.7MB, backup size: 2MB", " repository size: 3.3MB, repository backup size: 211KB", - " backup reference list: 20190520-140306F, 20190520-140306F_20190520-140404D" + " backup reference list: 20190625-014423F, 20190625-014423F_20190625-014525D" ] } }, @@ -13938,8 +13907,8 @@ "bash-wrap" : true, "cmd" : [ "sudo -u postgres pgbackrest --stanza=demo --delta \\", - " --type=time \"--target=2019-05-20 14:04:13.516529+00\" \\", - " --set=20190520-140306F_20190520-140404D --target-action=promote restore" + " --type=time \"--target=2019-06-25 01:45:33.362422+00\" \\", + " --set=20190625-014423F_20190625-014525D --target-action=promote restore" ], "host" : "pg-primary", "load-env" : true, @@ -14036,16 +14005,16 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:04:05 UTC", - "LOG: starting point-in-time recovery to 2019-05-20 14:04:13.516529+00", + "LOG: database system was interrupted; last known up at 2019-06-25 01:45:26 UTC", + "LOG: starting point-in-time recovery to 2019-06-25 01:45:33.362422+00", "LOG: restored log file \"00000004.history\" from archive", - "LOG: restored log file \"000000040000000000000015\" from archive", - "LOG: redo starts at 0/15000028", - "LOG: consistent recovery state reached at 0/150000F8", "LOG: restored log file \"000000040000000000000016\" from archive", - "LOG: recovery stopping before commit of transaction 639, time 2019-05-20 14:04:13.778722+00", - "LOG: redo done at 0/160203B0", - "LOG: last completed transaction was at log time 2019-05-20 14:04:13.250355+00", + "LOG: redo starts at 0/16000028", + "LOG: consistent recovery state reached at 0/160000F8", + "LOG: restored log file \"000000040000000000000017\" from archive", + "LOG: recovery stopping before commit of transaction 639, time 2019-06-25 01:45:33.807831+00", + "LOG: redo done at 0/17020CA8", + "LOG: last completed transaction was at log time 2019-06-25 01:45:32.937199+00", "LOG: restored log file \"00000005.history\" from archive", "LOG: restored log file \"00000006.history\" from archive", " [filtered 5 lines of output]" @@ -14070,9 +14039,22 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "aws s3 --no-verify-ssl mb s3://demo-bucket 2>&1" + "echo \"172.17.0.2 demo-bucket.s3.us-east-1.amazonaws.com s3.us-east-1.amazonaws.com\" | tee -a /etc/hosts" ], - "host" : "s3-server", + "host" : "pg-primary", + "load-env" : true, + "output" : false, + "run-as-user" : "root" + }, + "type" : "exe" + }, + { + "key" : { + "bash-wrap" : true, + "cmd" : [ + "mc config host add demo https://172.17.0.2 accessKey1 verySecretKey1 --insecure" + ], + "host" : "pg-primary", "load-env" : true, "output" : false, "run-as-user" : null @@ -14081,34 +14063,16 @@ }, { "key" : { - "file" : "/etc/pgbackrest/pgbackrest.conf", + "bash-wrap" : true, + "cmd" : [ + "mc mb demo/demo-bucket --insecure" + ], "host" : "pg-primary", - "option" : { - "global" : { - "repo1-cipher-pass" : {}, - "repo1-cipher-type" : { - "value" : "none" - } - } - } + "load-env" : true, + "output" : false, + "run-as-user" : null }, - "type" : "cfg-pgbackrest", - "value" : { - "config" : [ - "[demo]", - "pg1-path=/var/lib/pgsql/9.6/data", - "", - "[global]", - "repo1-cipher-type=none", - "repo1-path=/var/lib/pgbackrest", - "repo1-retention-diff=2", - "repo1-retention-full=2", - "start-fast=y", - "", - "[global:archive-push]", - "compress-level=3" - ] - } + "type" : "exe" }, { "key" : { @@ -14125,8 +14089,11 @@ "repo1-s3-bucket" : { "value" : "demo-bucket" }, + "repo1-s3-ca-file" : { + "value" : "/etc/pki/tls/certs/ca-bundle.crt" + }, "repo1-s3-endpoint" : { - "value" : "s3.amazonaws.com" + "value" : "s3.us-east-1.amazonaws.com" }, "repo1-s3-key" : { "value" : "accessKey1" @@ -14137,9 +14104,6 @@ "repo1-s3-region" : { "value" : "us-east-1" }, - "repo1-s3-verify-ssl" : { - "value" : "n" - }, "repo1-type" : { "value" : "s3" } @@ -14154,12 +14118,14 @@ "", "[global]", "process-max=4", - "repo1-cipher-type=none", + "repo1-cipher-pass=zWaf6XtpjIVZC5444yXB+cgFDFl7MxGlgkZSaoPvTGirhPygu4jOKOXf9LO4vjfO", + "repo1-cipher-type=aes-256-cbc", "repo1-path=/demo-repo", "repo1-retention-diff=2", "repo1-retention-full=2", "repo1-s3-bucket=demo-bucket", - "repo1-s3-endpoint=s3.amazonaws.com", + "repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt", + "repo1-s3-endpoint=s3.us-east-1.amazonaws.com", "repo1-s3-key=accessKey1", "repo1-s3-key-secret=verySecretKey1", "repo1-s3-region=us-east-1", @@ -14171,19 +14137,6 @@ ] } }, - { - "key" : { - "bash-wrap" : true, - "cmd" : [ - "echo \"172.17.0.3 demo-bucket.s3.amazonaws.com s3.amazonaws.com\" | tee -a /etc/hosts" - ], - "host" : "pg-primary", - "load-env" : true, - "output" : false, - "run-as-user" : "root" - }, - "type" : "exe" - }, { "key" : { "bash-wrap" : true, @@ -14205,7 +14158,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-create command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-create command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-create command end: completed successfully" ] } @@ -14232,17 +14185,17 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: backup command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=4 --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo --start-fast", + "P00 INFO: backup command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=4 --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-retention-diff=2 --repo1-retention-full=2 --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo --start-fast", "P00 WARN: no prior backup exists, incr backup has been changed to full", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:04:49\": backup begins after the requested immediate checkpoint completes", - "P00 INFO: backup start archive = 000000070000000000000017, lsn = 0/17000028", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:46:14\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: backup start archive = 000000070000000000000018, lsn = 0/18000028", " [filtered 1136 lines of output]", - "P01 INFO: backup file /var/lib/pgsql/9.6/data/base/1/12312 (0B, 100%)", - "P04 INFO: backup file /var/lib/pgsql/9.6/data/base/1/12307 (0B, 100%)", - "P00 INFO: full backup size = 27.8MB", + "P04 INFO: backup file /var/lib/pgsql/9.6/data/base/1/12312 (0B, 100%)", + "P01 INFO: backup file /var/lib/pgsql/9.6/data/base/1/12307 (0B, 100%)", + "P00 INFO: full backup size = 27.7MB", "P00 INFO: execute non-exclusive pg_stop_backup() and wait for all WAL segments to archive", - "P00 INFO: backup stop archive = 000000070000000000000017, lsn = 0/17000130", - " [filtered 4 lines of output]" + "P00 INFO: backup stop archive = 000000070000000000000018, lsn = 0/18000130", + " [filtered 5 lines of output]" ] } }, @@ -14280,7 +14233,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stop command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stop command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stop command end: completed successfully" ] } @@ -14306,7 +14259,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-delete command begin 2.14: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-type=none --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-endpoint=s3.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --no-repo1-s3-verify-ssl --repo1-type=s3 --stanza=demo", + "P00 INFO: stanza-delete command begin 2.15: --log-level-console=info --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-cipher-pass= --repo1-cipher-type=aes-256-cbc --repo1-path=/demo-repo --repo1-s3-bucket=demo-bucket --repo1-s3-ca-file=/etc/pki/tls/certs/ca-bundle.crt --repo1-s3-endpoint=s3.us-east-1.amazonaws.com --repo1-s3-key= --repo1-s3-key-secret= --repo1-s3-region=us-east-1 --repo1-type=s3 --stanza=demo", "P00 INFO: stanza-delete command end: completed successfully" ] } @@ -14368,7 +14321,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "repository", @@ -14954,14 +14907,14 @@ " db (current)", " wal archive min/max (9.6-1): 00000008000000000000001E/00000008000000000000001F", "", - " full backup: 20190520-140617F", - " timestamp start/stop: 2019-05-20 14:06:17 / 2019-05-20 14:06:32", + " full backup: 20190625-014744F", + " timestamp start/stop: 2019-06-25 01:47:44 / 2019-06-25 01:47:59", " wal start/stop: 00000008000000000000001E / 00000008000000000000001E", " database size: 27.8MB, backup size: 27.8MB", " repository size: 3.2MB, repository backup size: 3.2MB", "", - " full backup: 20190520-140634F", - " timestamp start/stop: 2019-05-20 14:06:34 / 2019-05-20 14:06:42", + " full backup: 20190625-014801F", + " timestamp start/stop: 2019-06-25 01:48:01 / 2019-06-25 01:48:10", " wal start/stop: 00000008000000000000001F / 00000008000000000000001F", " database size: 27.8MB, backup size: 27.8MB", " repository size: 3.2MB, repository backup size: 3.2MB" @@ -15108,7 +15061,7 @@ "key" : { "bash-wrap" : true, "cmd" : [ - "sudo scp build:/root/pgbackrest-release-2.14/src/pgbackrest /usr/bin" + "sudo scp build:/root/pgbackrest-release-2.15/src/pgbackrest /usr/bin" ], "cmd-extra" : "2>&1", "host" : "pg-standby", @@ -15434,7 +15387,7 @@ "value" : "3" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -15447,7 +15400,7 @@ "log_filename = 'postgresql.log'", "log_line_prefix = ''", "max_wal_senders = 3", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -15511,7 +15464,7 @@ "type" : "exe", "value" : { "output" : [ - "LOG: database system was interrupted; last known up at 2019-05-20 14:06:35 UTC", + "LOG: database system was interrupted; last known up at 2019-06-25 01:48:02 UTC", "LOG: entering standby mode", "LOG: restored log file \"00000008.history\" from archive", "LOG: restored log file \"00000008000000000000001F\" from archive", @@ -15598,7 +15551,7 @@ "output" : [ " pg_switch_xlog | now ", "----------------+-------------------------------", - " 0/20021950 | 2019-05-20 14:07:16.532022+00", + " 0/20022268 | 2019-06-25 01:48:58.731098+00", "(1 row)" ] } @@ -15627,7 +15580,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:07:19.164942+00", + " Important Data | 2019-06-25 01:49:00.677035+00", "(1 row)" ] } @@ -15653,7 +15606,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-host=repository --stanza=demo", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-host=repository --stanza=demo", "P00 INFO: switch xlog cannot be performed on the standby, all other checks passed successfully", "P00 INFO: check command end: completed successfully" ] @@ -15825,7 +15778,7 @@ "log_filename = 'postgresql.log'", "log_line_prefix = ''", "max_wal_senders = 3", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -15924,7 +15877,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:07:31.813179+00", + " Important Data | 2019-06-25 01:49:15.642895+00", "(1 row)" ] } @@ -15953,7 +15906,7 @@ "output" : [ " message | now ", "----------------+-------------------------------", - " Important Data | 2019-05-20 14:07:32.117189+00", + " Important Data | 2019-06-25 01:49:16.383919+00", "(1 row)" ] } @@ -16185,8 +16138,8 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: check command begin 2.14: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-host=repository --stanza=demo", - "P00 INFO: WAL segment 000000080000000000000026 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.6-1/0000000800000000/000000080000000000000026-317e0c250d39c0834a543a884b0a2d20e0b8a830.gz'", + "P00 INFO: check command begin 2.15: --log-level-console=info --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --repo1-host=repository --stanza=demo", + "P00 INFO: WAL segment 000000080000000000000026 successfully stored in the archive at '/var/lib/pgbackrest/archive/demo/9.6-1/0000000800000000/000000080000000000000026-693b8d4fb09c1d2fd269f7da1b523d976bc61442.gz'", "P00 INFO: check command end: completed successfully" ] } @@ -16213,13 +16166,13 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000021", "P01 DETAIL: pushed WAL file '000000080000000000000021' to the archive", "P00 INFO: archive-push-async command end: completed successfully", "", "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", "P00 INFO: push 4 WAL file(s) to archive: 000000080000000000000022...000000080000000000000025", "P01 DETAIL: pushed WAL file '000000080000000000000022' to the archive", "P02 DETAIL: pushed WAL file '000000080000000000000023' to the archive", @@ -16228,9 +16181,10 @@ "P00 INFO: archive-push-async command end: completed successfully", "", "-------------------PROCESS START-------------------", - "P00 INFO: archive-push-async command begin 2.14: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: archive-push-async command begin 2.15: [/var/lib/pgsql/9.6/data/pg_xlog] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", "P00 INFO: push 1 WAL file(s) to archive: 000000080000000000000026", - "P01 DETAIL: pushed WAL file '000000080000000000000026' to the archive" + "P01 DETAIL: pushed WAL file '000000080000000000000026' to the archive", + "P00 INFO: archive-push-async command end: completed successfully" ] } }, @@ -16269,23 +16223,24 @@ "value" : { "output" : [ "-------------------PROCESS START-------------------", - "P00 INFO: archive-get-async command begin 2.14: [00000008000000000000001F, 000000080000000000000020, 000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: archive-get-async command begin 2.15: [00000008000000000000001F, 000000080000000000000020, 000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", "P00 INFO: get 8 WAL file(s) from archive: 00000008000000000000001F...000000080000000000000026", "P01 DETAIL: found 00000008000000000000001F in the archive", "P02 DETAIL: found 000000080000000000000020 in the archive", "P01 DETAIL: unable to find 000000080000000000000021 in the archive", "P02 DETAIL: unable to find 000000080000000000000022 in the archive", " [filtered 20 lines of output]", - "P00 INFO: archive-get-async command begin 2.14: [000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", + "P00 INFO: archive-get-async command begin 2.15: [000000080000000000000021, 000000080000000000000022, 000000080000000000000023, 000000080000000000000024, 000000080000000000000025, 000000080000000000000026, 000000080000000000000027, 000000080000000000000028] --log-level-console=off --log-level-file=detail --log-level-stderr=off --no-log-timestamp --pg1-path=/var/lib/pgsql/9.6/data --process-max=2 --repo1-host=repository --spool-path=/var/spool/pgbackrest --stanza=demo", "P00 INFO: get 8 WAL file(s) from archive: 000000080000000000000021...000000080000000000000028", - "P01 DETAIL: found 000000080000000000000021 in the archive", "P02 DETAIL: found 000000080000000000000022 in the archive", - "P01 DETAIL: found 000000080000000000000023 in the archive", - "P02 DETAIL: found 000000080000000000000024 in the archive", + "P01 DETAIL: found 000000080000000000000021 in the archive", + "P01 DETAIL: found 000000080000000000000024 in the archive", + "P02 DETAIL: found 000000080000000000000023 in the archive", "P01 DETAIL: found 000000080000000000000025 in the archive", "P02 DETAIL: found 000000080000000000000026 in the archive", "P01 DETAIL: unable to find 000000080000000000000027 in the archive", - "P02 DETAIL: unable to find 000000080000000000000028 in the archive" + "P02 DETAIL: unable to find 000000080000000000000028 in the archive", + " [filtered 13 lines of output]" ] } }, @@ -16367,15 +16322,15 @@ "value" : { "output" : [ " [filtered 2 lines of output]", - "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-05-20 14:07:48\": backup begins after the requested immediate checkpoint completes", + "P00 INFO: execute non-exclusive pg_start_backup() with label \"pgBackRest backup started at 2019-06-25 01:49:35\": backup begins after the requested immediate checkpoint completes", "P00 INFO: backup start archive = 000000080000000000000028, lsn = 0/28000028", "P00 INFO: wait for replay on the standby to reach 0/28000028", - "P00 INFO: replay on the standby reached 0/280000D0, checkpoint 0/28000060", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.6/data/global/pg_control (8KB, 0%) checksum bc69ac512e035168121c46e976cfc4fc3c07e444", - "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.6/data/pg_log/postgresql.log (5.3KB, 0%) checksum 96ec661d0f4aafd91f962d23b2d1014e1b99540e", + "P00 INFO: replay on the standby reached 0/280003C0, checkpoint 0/28000060", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.6/data/global/pg_control (8KB, 0%) checksum 60d5a83dacc30005f648638b382a9cac1c98a83c", + "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.6/data/pg_log/postgresql.log (5.5KB, 0%) checksum 1b8b1c4e74a42018e132de85a9d0f72c4917b2b0", "P01 INFO: backup file pg-primary:/var/lib/pgsql/9.6/data/pg_hba.conf (4.1KB, 0%) checksum 1c0bca2f7f44d354aaaefb2c21fd1290b7379690", - "P02 INFO: backup file pg-standby:/var/lib/pgsql/9.6/data/base/12470/2608 (440KB, 20%) checksum 8d99d8565e5c0e62a850b6562d9fe5bb02eb67f6", - "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.6/data/base/12470/1249 (360KB, 37%) checksum 1d449a51386bb0a538c12928c71ff7be706bdf28", + "P02 INFO: backup file pg-standby:/var/lib/pgsql/9.6/data/base/12470/2608 (440KB, 21%) checksum 596500d5404a89dd47a1c8fc7474b90bb3c32121", + "P03 INFO: backup file pg-standby:/var/lib/pgsql/9.6/data/base/12470/1249 (360KB, 37%) checksum faf11ef681c050046d598703e8776eca3812ea7a", " [filtered 38 lines of output]" ] } @@ -16482,7 +16437,7 @@ "value" : "5432" }, "wal_level" : { - "value" : "hot_standby" + "value" : "replica" } } }, @@ -16495,7 +16450,7 @@ "log_line_prefix = ''", "max_wal_senders = 3", "port = 5432", - "wal_level = hot_standby" + "wal_level = replica" ] } }, @@ -16639,7 +16594,7 @@ "type" : "exe", "value" : { "output" : [ - "P00 INFO: stanza-upgrade command begin 2.14: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/pgsql/10/data --pg2-path=/var/lib/pgsql/10/data --repo1-path=/var/lib/pgbackrest --stanza=demo", + "P00 INFO: stanza-upgrade command begin 2.15: --no-backup-standby --log-level-console=info --log-level-stderr=off --no-log-timestamp --no-online --pg1-host=pg-primary --pg2-host=pg-standby --pg1-path=/var/lib/pgsql/10/data --pg2-path=/var/lib/pgsql/10/data --repo1-path=/var/lib/pgbackrest --stanza=demo", "P00 INFO: stanza-upgrade command end: completed successfully" ] } @@ -16673,20 +16628,20 @@ "output" : [ "● postgresql-10.service - PostgreSQL 10 database server", " Loaded: loaded (/usr/lib/systemd/system/postgresql-10.service; disabled; vendor preset: disabled)", - " Active: active (running) since Mon 2019-05-20 14:08:05 UTC; 261ms ago", + " Active: active (running) since Tue 2019-06-25 01:49:57 UTC; 421ms ago", " Docs: https://www.postgresql.org/docs/10/static/", - " Process: 3950 ExecStartPre=/usr/pgsql-10/bin/postgresql-10-check-db-dir ${PGDATA} (code=exited, status=0/SUCCESS)", - " Main PID: 3955 (postmaster)", - " CGroup: /docker/b72c0bc5dbc2d39184f23b24abf2b0649c78e0a8ac2023a8cac7da089ae3aadb/system.slice/postgresql-10.service", - " ├─3955 /usr/pgsql-10/bin/postmaster -D /var/lib/pgsql/10/data/", - " ├─3956 postgres: logger process ", - " ├─3958 postgres: checkpointer process ", - " ├─3959 postgres: writer process ", - " ├─3960 postgres: wal writer process ", - " ├─3961 postgres: autovacuum launcher process ", - " ├─3962 postgres: archiver process ", - " ├─3963 postgres: stats collector process ", - " └─3964 postgres: bgworker: logical replication launcher " + " Process: 3986 ExecStartPre=/usr/pgsql-10/bin/postgresql-10-check-db-dir ${PGDATA} (code=exited, status=0/SUCCESS)", + " Main PID: 3991 (postmaster)", + " CGroup: /docker/22adc956e711d039bce132beac84beb0782d62eebef745e5325d50ee2fffb506/system.slice/postgresql-10.service", + " ├─3991 /usr/pgsql-10/bin/postmaster -D /var/lib/pgsql/10/data/", + " ├─3992 postgres: logger process ", + " ├─3994 postgres: checkpointer process ", + " ├─3995 postgres: writer process ", + " ├─3996 postgres: wal writer process ", + " ├─3997 postgres: autovacuum launcher process ", + " ├─3998 postgres: archiver process ", + " ├─3999 postgres: stats collector process ", + " └─4000 postgres: bgworker: logical replication launcher " ] } }, diff --git a/doc/resource/git-history.cache b/doc/resource/git-history.cache index b7c75c389..7da910374 100644 --- a/doc/resource/git-history.cache +++ b/doc/resource/git-history.cache @@ -1,4 +1,445 @@ [ + { + "commit": "51fcaee43edf022aea0f94b76d254f2de8b6e1d1", + "date": "2019-06-25 07:58:38 -0400", + "subject": "Add host-repo-path variable internal replacement.", + "body": "This variable needs to be replaced right before being used without being added to the cache since the host repo path will vary from system to system.\n\nThis is frankly a bit of a hack to get the documentation to build in the Debian packages for the upcoming release. We'll need to come up with something more flexible going forward." + }, + { + "commit": "5cbe2dee855577ccd14051cad35f30376db21d50", + "date": "2019-06-25 07:36:16 -0400", + "subject": "Add compress-level-network option to ls command.", + "body": "039e515a added a dependency on compress-level-network but the ls command did not get updated." + }, + { + "commit": "d7f12f268a370e388c6a6375666831ecd8fad72c", + "date": "2019-06-24 19:27:13 -0400", + "subject": "Redact secure options in the help command.", + "body": "Secure options could show up in the help as \"current\". While the user must have permissions to see the source of the options (e.g. environment, config file) it's still not a good idea to display them in an unexpected context.\n\nInstead show secure options as in the help command." + }, + { + "commit": "c22e10e4a938b444ac7912efc3b751829401360f", + "date": "2019-06-24 15:42:33 -0400", + "subject": "Honor configure --prefix option.", + "body": "The --prefix option was entirely ignored and DESTDIR was a combination of DESTDIR and bindir.\n\nBring both in line with recommendations for autoconf and make as specified in https://www.gnu.org/software/make/manual/html_node/Directory-Variables.html and https://www.gnu.org/prep/standards/html_node/DESTDIR.html.\n\nSuggested by Daniel Westermann." + }, + { + "commit": "b498188f01f8d2ccd4d0ce2cce3af2e5069d9ac3", + "date": "2019-06-24 11:59:44 -0400", + "subject": "Error on db history mismatch when expiring.", + "body": "Amend commit 434cd832 to error when the db history in archive.info and backup.info do not match.\n\nThe Perl code would attempt to reconcile the history by matching on system id and version but we are not planning to migrate that code to C. It's possible that there are users with mismatches but if so they should have been getting errors from info for the last six months. It's easy enough to manually fix these files if there are any mismatches in the field.\n\nContributed by Cynthia Shang." + }, + { + "commit": "039e515a319216035187c89efccf97143d4cac03", + "date": "2019-06-24 10:20:47 -0400", + "subject": "Allow protocol compression when read/writing remote files.", + "body": "If the file is compressible (i.e. not encrypted or already compressed) it can be marked as such in storageNewRead()/storageNewWrite(). If the file is being read from/written to a remote it will be compressed in transit using gzip.\n\nSimplify filter group handling by having the IoRead/IoWrite objects create the filter group automatically. This removes the need for a lot of NULL checking and has a negligible effect on performance since a filter group needs to be created eventually unless the source file is missing.\n\nAllow filters to be created using a VariantList so filter parameters can be passed to the remote." + }, + { + "commit": "62715ebf2d8b0585c35cd2ee14d6aabf9cc0f1f8", + "date": "2019-06-19 17:49:38 -0400", + "subject": "Fix archive retention expiring too aggressively.", + "body": "The problem expressed when repo1-archive-retention-type was set to diff. In this case repo1-archive-retention ended up being effectively equal to one, which meant PITR recovery was only possible from the last backup. WAL required for consistency was still preserved for all backups.\n\nThis issue is not present in the C migration committed at 434cd832, which was written before this bug was reported. Even so, we wanted to note this issue in the release notes in case any other users have been affected.\n\nFixed by Cynthia Shang.\nReported by Mohamad El-Rifai." + }, + { + "commit": "a7d64bab7abe56132ad1c83eb6bfcca1166e0000", + "date": "2019-06-18 19:02:09 -0400", + "subject": "Add FAQ on where to find old Debian/Ubuntu packages." + }, + { + "commit": "e2d791394a3577aac53a21e3141e4e337ac8edf0", + "date": "2019-06-18 18:42:47 -0400", + "subject": "Add FAQ to the documentation.", + "body": "Contributed by Cynthia Shang." + }, + { + "commit": "434cd832855e4e189403962753fd8771e29880a4", + "date": "2019-06-18 15:19:20 -0400", + "subject": "The expire command is implemented entirely in C.", + "body": "This implementation duplicates the functionality of the Perl code but does so with different logic and includes full unit tests.\n\nAlong the way at least one bug was fixed, see issue #748.\n\nContributed by Cynthia Shang." + }, + { + "commit": "f88bee7b3321a2c79f0317913ba1e83a56d19c7d", + "date": "2019-06-18 10:13:28 -0400", + "subject": "TLS/HTTP statistics log replacements.", + "body": "These statistics can change with any code update so they cause a lot of churn in the expect logs." + }, + { + "commit": "0efdf2576f02b1768fb8805b27571e403ac3cb52", + "date": "2019-06-18 07:35:34 -0400", + "subject": "Remove hard-coded PostgreSQL user so $PGUSER works.", + "body": "The PostgreSQL user was hard-coded to the OS user which libpq will automatically use if $PGUSER is not set, so this code was redundant and prevented $PGUSER from working when set.\n\nSuggested by Julian Zhang, Janis Puris." + }, + { + "commit": "593446718a8997bfd674cf5e54230290cb5bcdea", + "date": "2019-06-18 06:45:47 -0400", + "subject": "Add S3 info type missed in 7f2f5354.", + "body": "File is the only type possible in S3." + }, + { + "commit": "0a96a2895d7a1e4c5eec402d3742f1d1e25cc126", + "date": "2019-06-17 09:16:44 -0400", + "subject": "Add storage layer for tests and documentation.", + "body": "The tests and documentation have been using the core storage layer but soon that will depend entirely on the C library, creating a bootstrap problem (i.e. the storage layer will be needed to build the C library).\n\nCreate a simplified Posix storage layer to be used by documentation and the parts of the test code that build and execute the actual tests. The actual tests will still use the core storage driver so they can interact with any type of storage." + }, + { + "commit": "ceafd8e19d416106f50c4ff440bf1cf7fcb5553f", + "date": "2019-06-17 07:52:03 -0400", + "subject": "Migrate page checksum filter to C.", + "body": "This filter exactly mimics the behavior of the Perl filter so is a drop-in replacement.\n\nThe filter is not integrated yet since it requires the Perl-to-C storage layer interface coming in a future commit." + }, + { + "commit": "892f35a7283462fae0bc3077aeb23c9624a50dea", + "date": "2019-06-17 07:42:12 -0400", + "subject": "Add new types to JSON render.", + "body": "Still not a complete list, but we are getting there." + }, + { + "commit": "c64c9c05905d435cd650195ed9470355a4d2be2f", + "date": "2019-06-17 06:59:06 -0400", + "subject": "Add backup management functions to InfoBackup.", + "body": "Allow current backups to be listed and deleted.\n\nAlso expose some constants required by expire and stanza-* commands.\n\nContributed by Cynthia Shang." + }, + { + "commit": "44bafc127d9d4e38478aa44d0adc0f34695c6640", + "date": "2019-06-17 06:47:15 -0400", + "subject": "Rename info*New() functions to info*NewLoad().", + "body": "These names more accurately reflect what the functions do and follow the convention started in Info and InfoPg.\n\nAlso remove the ignoreMissing parameter since it was never used.\n\nContributed by Cynthia Shang." + }, + { + "commit": "f05fbc54a8f00a56937439fb88eafe8e239781e8", + "date": "2019-06-14 08:04:28 -0400", + "subject": "Fix filters not processing when there is no input.", + "body": "Some filters (e.g. encryption and compression) produce output even if there is no input. Since the filter group was marked as \"done\" initially, processing would not run when there was zero input and that resulted in zero output.\n\nAll filters start not done so start the filter group the same way." + }, + { + "commit": "9ba95e993ba3dbf73f8967a875608980e6380633", + "date": "2019-06-13 17:58:33 -0400", + "subject": "Use retries to wait for test S3 server to start.", + "body": "The prior method of tailing the docker log no longer seems reliable. Instead, keep retrying the make bucket command until it works and show the error if it times out." + }, + { + "commit": "b9233f7412e44c8daf41db05bd9699fa088ece5d", + "date": "2019-06-13 12:44:40 -0400", + "subject": "Create filter group in read/write object's memory context.", + "body": "The filter group was being created in the parent context so it would go away if the parent context was freed." + }, + { + "commit": "20be5c9bf39d606b8586ffcf575a7443c6375479", + "date": "2019-06-13 12:35:13 -0400", + "subject": "Remove extra spaces." + }, + { + "commit": "fdd375b63d3962845efbb38a7020d852143b97fd", + "date": "2019-06-11 16:26:32 -0400", + "subject": "Integrate S3 storage driver with HTTP client cache.", + "body": "This allows copying from one S3 object to another. We generally try to avoid doing this but there are a few cases where it is needed and the tests do it quite a bit.\n\nOne thing to look out for here is that reads require the http client to be explicitly released by calling httpClientDone(). This means than clients could grow if they are not released properly. The http statistics will hopefully alert us if this is happening." + }, + { + "commit": "ced42d6511e9b5735a2281dd0e1faec41870fd37", + "date": "2019-06-11 10:48:22 -0400", + "subject": "Add HTTP client cache.", + "body": "This cache manages multiple http clients and returns one to the caller that is not busy. It is the responsibility of the caller to indicate when they are done with a client. If returnContent is set then the client will automatically be marked done.\n\nAlso add special handing for HEAD requests to recognize that content-length is informational only and no content is expected." + }, + { + "commit": "6e809e578fbd24269205de25cc6e9c84cefc5647", + "date": "2019-06-11 10:34:42 -0400", + "subject": "Add tag to specify minio version to use for documentation build.", + "body": "The new minio major release broke the build. We'll need to figure that out but for now use the last major version, which is known to work." + }, + { + "commit": "7f2f535460e3499c1811b5beca9130f84b78c982", + "date": "2019-06-10 16:09:38 -0400", + "subject": "Add info() and infoList() to S3 driver.", + "body": "These should be the last functions required to complete the implementation of the S3 driver." + }, + { + "commit": "9d1b03781f9fe88b868cdfaf4808d84ad1f072fb", + "date": "2019-06-10 15:52:51 -0400", + "subject": "Revert removal of aws cli in 3e1b06ac.", + "body": "This is required for integration tests to create buckets." + }, + { + "commit": "456391f67c220647e130fdc7a7fc805b075cfd87", + "date": "2019-06-10 12:23:04 -0400", + "subject": "Create general-purpose S3 list function.", + "body": "There are already two functions which need file lists and more on the way, so create a general-purpose function to reduce code duplication." + }, + { + "commit": "fb8bd095ca93e2bf77eaec0f7573f961f691c3ab", + "date": "2019-06-10 10:37:20 -0400", + "subject": "Add missing const qualifiers." + }, + { + "commit": "78b333790c69aca991f740a9ea6b1982fb70c3d6", + "date": "2019-06-07 10:35:44 -0400", + "subject": "Return IoRead/IoWrite from io*FilterGroupSet()", + "body": "This makes is possible to chain functions more effectively." + }, + { + "commit": "e701e8fd846539ec20f2a9be90b0590ceb6a7be6", + "date": "2019-06-05 11:50:49 -0400", + "subject": "Expose storage type.", + "body": "Code calling the storage should be driver agnostic but knowing the storage type can be useful for debugging and error reporting." + }, + { + "commit": "6ff3325c7744a8f6f0e1e965fa673040a2f40a71", + "date": "2019-06-05 11:43:17 -0400", + "subject": "Enforce requiring repo-cipher-pass at config parse time.", + "body": "This was not enforced at parse time because repo1-cipher-type could be passed on the command-line even in cases where encryption was not needed by the subprocess.\n\nFilter repo-cipher-type so it is never passed on the command line. If the subprocess does not have access to the passphrase then knowing the encryption type is useless anyway." + }, + { + "commit": "d7bd0c58cdd9a434aa5893db16e6bcf8425e26b9", + "date": "2019-06-05 07:27:24 -0400", + "subject": "Use wal_level=replica in the documentation for PostgreSQL >= 9.6.", + "body": "The documentation was using wal_level=hot_standby which is a deprecated setting.\n\nAlso remove the reference to wal_level=archive since it is no longer supported and is not recommended for older versions.\n\nSuggested by Patrick McLaughlin." + }, + { + "commit": "aca11b2fa19337f934fc095e33f014d5e6df71f3", + "date": "2019-06-04 17:40:27 -0400", + "subject": "Add String to types supported by JSON list render.", + "body": "All types should be supported eventually but for now this answers the need." + }, + { + "commit": "0ab6f3bb87005d5a5d102156730b1e3099894189", + "date": "2019-06-04 13:38:05 -0400", + "subject": "Fix incorrect error type on missing path." + }, + { + "commit": "4b91259de8d7feec6d33d154032169aa32c879e3", + "date": "2019-06-04 12:56:04 -0400", + "subject": "Make working with filter groups less restrictive.", + "body": "Filter groups could not be manipulated once they had been assigned to an IO object. Now they can be freely manipulated up to the time the IO object is opened.\n\nAlso, move the filter group into the IO object's context so they don't need to be tracked separately." + }, + { + "commit": "92e04ea9f4e0eb3f6cd88a72497a026cbd348280", + "date": "2019-06-04 10:34:19 -0400", + "subject": "Remove per-stanza repo cache clear during testing.", + "body": "This was not being used and is not supported by the equivalent C code." + }, + { + "commit": "44eb21ea935fdaa4e96d4637c7b62cb5a73d3e77", + "date": "2019-06-04 10:05:27 -0400", + "subject": "Use HEAD to check if a file exists on S3.", + "body": "The previous implementation searched for the file in a list which worked but was not optimal. For arbitrary bucket structures it would also produce a false negative if a match was not found in the first 1000 entries. This was not an issue for our repo structure since the max hits on exists calls is two but it seems worth fixing to avoid future complications." + }, + { + "commit": "15b8e3b6af7327179d8bdd2e0c6833ed28005b0b", + "date": "2019-06-04 09:39:08 -0400", + "subject": "Make C S3 requests use the same host logic as Perl.", + "body": "The C code was passing the host (if specified) with the request which could force the server into path-style URLs, which are not supported.\n\nInstead, use the Perl logic of always passing bucket.endpoint in the request no matter what host is used for the HTTPS connection.\n\nIt's an open question whether we should support path-style URLs but since we don't it's useless to tell the server otherwise. Note that Amazon S3 has deprecated path-style URLs and they are no longer supported on newly created buckets." + }, + { + "commit": "5f92c36b30072edb71b12f79163c37c67d9806bc", + "date": "2019-06-04 08:04:33 -0400", + "subject": "Fix erroneous parameter name.", + "body": "The exists() function only checks for files so the parameter name should reflect that." + }, + { + "commit": "0945d9666b5af1a5893ba0b4537e9cd1f72be478", + "date": "2019-06-01 11:09:01 -0400", + "subject": "Bring back PATH_PAX for platforms that don't define it.", + "body": "This define was replaced in 8c712d89 with limits.h but that caused an issue with the hurd-i386 build for Debian which apparently does not define this value." + }, + { + "commit": "a207af79215d05539825c484dbfa9aa2a26cf7d0", + "date": "2019-06-01 09:44:40 -0400", + "subject": "Fix mismatched log/test macros." + }, + { + "commit": "12bca3c43eb2ee0df80ef5e10850657b52fb680b", + "date": "2019-06-01 09:28:31 -0400", + "subject": "Add CPPFLAGS to compile rules.", + "body": "This should silence the last of the Debian package warnings." + }, + { + "commit": "388ba0458c37ab4e8b82df0c0fa2b6a4d7462ecb", + "date": "2019-05-31 18:37:31 -0400", + "subject": "Fix build.flags being removed on each build.", + "body": "This was being removed by rsync which forced a full build even when a partial should have been fine. Rewrite the file after the rsync so it is preserved." + }, + { + "commit": "6cba50c3f23a7a7822ae0fd03ff3b5a3f6d8a32a", + "date": "2019-05-31 18:32:40 -0400", + "subject": "Remove Debian package patch merged to upstream." + }, + { + "commit": "3a5fd7b28a79c1564ddd2b5bad36d4d4be358453", + "date": "2019-05-30 11:19:59 -0400", + "subject": "Fix typo in macro name." + }, + { + "commit": "a2ec1253e97805e2a3b990d8bc23c98ab8013d09", + "date": "2019-05-30 10:44:35 -0400", + "subject": "Add code classification exclusion missed in 3e1b06ac." + }, + { + "commit": "64260b2e9878944116dc78812a3a21633c5f3d15", + "date": "2019-05-29 08:38:45 -0400", + "subject": "Build all docs with S3 using --var=s3-all=y", + "body": "Force repo-type=s3 for all tests. This is not currently the default for any OS builds." + }, + { + "commit": "404284b90ff0f67fe29fa5a7b2831ebf51d459aa", + "date": "2019-05-28 12:18:05 -0400", + "subject": "Add internal flag for commands.", + "body": "Allow commands to be skipped by default in the command help but still work if help is requested for the command directly. There may be other uses for the flag in the future.\n\nUpdate help for ls now that it is exposed." + }, + { + "commit": "20e5b92f366848ec1464e2272c6af2c29ac7b36d", + "date": "2019-05-28 10:03:48 -0400", + "subject": "Add ls command.", + "body": "Allows listing repo paths/files from the command-line, to be used primarily for testing and debugging.\n\nThis command is internal-only so the interface may change at any time without notice." + }, + { + "commit": "3b3327eae6dd14f67f1002f094bd33ab7785f765", + "date": "2019-05-28 09:50:59 -0400", + "subject": "Move tls/http statistics output to command/command.", + "body": "This module already has the filtering required to keep these messages from being displayed by default for commands that output to stdout (e.g. info)." + }, + { + "commit": "3e1b06acaa84399abcfaa8c684f437b63aa38de5", + "date": "2019-05-27 07:37:20 -0400", + "subject": "Use minio as local S3 emulator in documentation.", + "body": "The documentation was relying on a ScalityS3 container built for testing which wasn't very transparent. Instead, use the stock minio container and configure it in the documentation.\n\nAlso, install certificates and CA so that TLS verification can be enabled." + }, + { + "commit": "a474ba54c5c9c7bdba6ffa3e92671bb9565889f6", + "date": "2019-05-26 12:41:15 -0400", + "subject": "Refactoring path support in the storage module.", + "body": "Not all storage types support paths as a physical thing that must be created/destroyed. Add a feature to determine which drivers use paths and simplify the driver API as much as possible given that knowledge and by implementing as much path logic as possible in the Storage object.\n\nRemove the ignoreMissing parameter from pathSync() since it is not used and makes little sense.\n\nCreate a standard list of error messages for the drivers to use and apply them where the code was modified -- there is plenty of work still to be done here." + }, + { + "commit": "38f28bd52081405321939fec66046bd9ada35c23", + "date": "2019-05-26 12:32:49 -0400", + "subject": "Log TLS and HTTP statistics on exit.", + "body": "These stats measure how efficiently TLS and HTTP are reusing connections (i.e. pipelining)." + }, + { + "commit": "819eda0818669ea9cc45bcd65c57e3b4c7d29129", + "date": "2019-05-26 12:29:29 -0400", + "subject": "Set log level of protocol processing functions to debug.", + "body": "Setting these to trace effectively made debug level useless in local/remote processes since all debug messages were demoted to trace when called from these functions." + }, + { + "commit": "d12d94c53c466eb808459b98669a877c19b5716b", + "date": "2019-05-24 18:09:16 -0400", + "subject": "Make info(), pathCreate() and pathSync() optional for storage drivers.", + "body": "These functions are not required for repository storage so make them optional and error if they are not implemented for non-repository storage, .e.g. pg or spool.\n\nThe goal is to simplify the drivers (e.g. S3) that are intended only for repository storage." + }, + { + "commit": "39645fc1a99540063399a7a3b86177a330bd743c", + "date": "2019-05-24 14:33:47 -0400", + "subject": "Add pathRemove() and remove() to S3 storage.", + "body": "These functions will be needed for the expire command." + }, + { + "commit": "6c385dfa7a7f489159c06c5a31fd3cd7c77c39a8", + "date": "2019-05-24 13:56:38 -0400", + "subject": "Add function to determine if HTTP response code is OK.", + "body": "OK responses are a range rather than a single value, so simplify the check with a function." + }, + { + "commit": "96770c529be4df408b9d1fc39fc5157e90555375", + "date": "2019-05-24 13:12:56 -0400", + "subject": "storageList() returns an empty list by default for missing paths.", + "body": "The prior behavior was to return NULL so the caller would know the path was missing, but this is rarely useful, complicates the calling code, and increases the chance of segfaults.\n\nThe .nullOnMissing param has been added to enable the prior behavior." + }, + { + "commit": "707e4a29f04a733cff868f37b90f8bf83a02394c", + "date": "2019-05-24 11:09:43 -0400", + "subject": "Notify compiler that cryptoErrorCode() does not return." + }, + { + "commit": "01f3024b5c0a83819d58ee6ccc2edb5109277aaa", + "date": "2019-05-24 11:06:11 -0400", + "subject": "Add missing const qualifier." + }, + { + "commit": "39cb6248314e21530924886e6e669ac395daeeb1", + "date": "2019-05-24 07:45:03 -0400", + "subject": "Add missing menus to the new user guides.", + "body": "Since the CentOS 6/7 user guides were generated as a single page they did not get menus. Generate the entire site for each user guide so menus are included." + }, + { + "commit": "04f8b4ea52f89d1542b25d2fb0ba28a43ddaba6d", + "date": "2019-05-24 07:41:55 -0400", + "subject": "Use git url for website clone." + }, + { + "commit": "ec9622cde883c649c1346cbc0b9057e7f3fcb787", + "date": "2019-05-22 18:54:49 -0400", + "subject": "Use the git log to ease release note management.", + "body": "The release notes are generally a direct reflection of the git log. So, ease the burden of maintaining the release notes by using the git log to determine what needs to be added.\n\nCurrently only non-dev items are required to be matched to a git commit but the goal is to account for all commits.\n\nThe git history cache is generated from the git log but can be modified to correct typos and match the release notes as they evolve. The commit hash is used to identify commits that have already been added to the cache.\n\nThere's plenty more to do here. For instance, links to the commits for each release item should be added to the release notes." + }, + { + "commit": "86482c7db943375d48fcee0e243ca96bdf50d35c", + "date": "2019-05-22 18:23:44 -0400", + "subject": "Reduce log level for all expect tests to detail.", + "body": "The C code is designed to be efficient rather than deterministic at the debug log level. As we move more testing from integration to unit tests it makes less sense to try and maintain the expect logs at this log level.\n\nMost of the expect logs have already been moved to detail level but mock/all still had tests at debug level. Change the logging defaults in the config file and remove as many references to log-level-console as possible." + }, + { + "commit": "e4cc008b982d47ac526962e310c18626e2aefbc2", + "date": "2019-05-22 11:31:38 -0400", + "subject": "Remove duplicated hint.", + "body": "At some point this hint got added to the underlying code so it is no longer needed here." + }, + { + "commit": "ff9c1bed5de380a6e7df1cbc6870b972d93b3dc4", + "date": "2019-05-22 11:24:18 -0400", + "subject": "Save cipher-pass key/value missed in f492f057.", + "body": "This value is required when encryption is enabled.\n\nIn passing simplify the expression used to skip the checksum when calculating the checksum." + }, + { + "commit": "3da60f4b5ee8ed663fc5e8d8968709dbaadee1f6", + "date": "2019-05-22 11:10:43 -0400", + "subject": "Don't escape / when rendering JSON.", + "body": "/ is escaped in the spec but the Perl renderer we use does not escape it which leads to checksum mismatches between the two sets of code.\n\nThis particular escape seems to be a more recent addition to the spec and is targeted toward embedding JSON in JavaScript.\n\n\\/ is still allowed when parsing JSON." + }, + { + "commit": "664054fea94186374dcae84e31e0cd7329c279d0", + "date": "2019-05-22 06:55:31 -0400", + "subject": "Remove RHEL package patch merged to upstream." + }, + { + "commit": "e1cce9c6147446c026f528cc4afe518de0bcb87f", + "date": "2019-05-21 14:07:35 -0400", + "subject": "Remove extraneous parens." + }, + { + "commit": "936b8a289c4884dd22f7ff0d3d624d6e70980512", + "date": "2019-05-21 10:37:30 -0400", + "subject": "Allow separate paragraphs in release items.", + "body": "The first paragraph should match the first line of the commit message as closely as possible. The following paragraphs add more information.\n\nRelease items have been updated back to 2.01." + }, + { + "commit": "e3fe3434b4428398ffbee5359f0e0cdec8e55bcb", + "date": "2019-05-21 10:14:41 -0400", + "subject": "Rename repo-s3-verify-ssl option to repo-s3-verify-tls.", + "body": "The new name is preferred because pgBackRest does not support any SSL protocol versions (they are all considered to be insecure).\n\nThe old name will continue to be accepted." + }, + { + "commit": "1bc84c647490d6cf78975b5dde5b1937016d24c6", + "date": "2019-05-20 17:07:37 -0400", + "subject": "The local command for restore is implemented entirely in C.", + "body": "This is just the part of restore run by the local helper processes, not the entire command.\n\nEven so, various optimizations in the code (like pipelining and optimizations for zero-length files) should make the restore command faster on object stores." + }, + { + "commit": "a839830333490555800377ea095d756765f476e4", + "date": "2019-05-20 16:19:14 -0400", + "subject": "Add most unimplemented functions to the remote storage driver.", + "body": "Add pathCreate(), pathRemove(), pathSync(), and remove() to the driver.\n\nContributed by Cynthia Shang." + }, + { + "commit": "bbf2e0d5b0876d3663cc69d10925c6e0d08cd729", + "date": "2019-05-20 12:24:43 -0400", + "subject": "Remove extra linefeed." + }, + { + "commit": "a9f589b87a09bd37ad903b5c37bcd3000d47840d", + "date": "2019-05-20 12:23:40 -0400", + "subject": "Begin v2.15 development." + }, { "commit": "0f685a33a02adde45792711b957a75391fc5f34e", "date": "2019-05-20 11:51:58 -0400", diff --git a/doc/xml/auto/metric-coverage-report.auto.xml b/doc/xml/auto/metric-coverage-report.auto.xml index d86bb0bc2..4ecefe95f 100644 --- a/doc/xml/auto/metric-coverage-report.auto.xml +++ b/doc/xml/auto/metric-coverage-report.auto.xml @@ -1,8 +1,8 @@ command 3/3 (100.0%) - 46/46 (100.0%) - 82/82 (100.0%) + 50/50 (100.0%) + 88/88 (100.0%) @@ -16,21 +16,21 @@ command/archive/get 6/6 (100.0%) 86/86 (100.0%) - 212/212 (100.0%) + 214/214 (100.0%) command/archive/push 9/9 (100.0%) 86/86 (100.0%) - 263/263 (100.0%) + 265/265 (100.0%) command/backup - 1/1 (100.0%) - 14/14 (100.0%) - 23/23 (100.0%) + 5/5 (100.0%) + 44/44 (100.0%) + 117/117 (100.0%) @@ -40,25 +40,32 @@ 17/17 (100.0%) + + command/expire + 10/10 (100.0%) + 130/130 (100.0%) + 266/266 (100.0%) + + command/help 4/4 (100.0%) - 110/110 (100.0%) - 163/163 (100.0%) + 114/114 (100.0%) + 161/161 (100.0%) command/info 7/7 (100.0%) - 104/104 (100.0%) - 259/259 (100.0%) + 100/100 (100.0%) + 257/257 (100.0%) command/local 1/1 (100.0%) --- - 15/15 (100.0%) + 16/16 (100.0%) @@ -68,6 +75,20 @@ 27/27 (100.0%) + + command/restore + 2/2 (100.0%) + 48/48 (100.0%) + 85/85 (100.0%) + + + + command/storage + 2/2 (100.0%) + 6/6 (100.0%) + 20/20 (100.0%) + + common 129/129 (100.0%) @@ -77,9 +98,9 @@ common/compress/gzip - 14/14 (100.0%) + 16/16 (100.0%) 22/22 (100.0%) - 158/158 (100.0%) + 167/167 (100.0%) @@ -98,51 +119,51 @@ common/io - 45/45 (100.0%) - 108/108 (100.0%) - 498/498 (100.0%) + 43/43 (100.0%) + 104/104 (100.0%) + 471/471 (100.0%) common/io/filter - 32/32 (100.0%) - 80/80 (100.0%) - 329/329 (100.0%) + 36/36 (100.0%) + 84/84 (100.0%) + 367/367 (100.0%) common/io/http - 29/29 (100.0%) - 146/146 (100.0%) - 388/388 (100.0%) + 36/36 (100.0%) + 162/162 (100.0%) + 463/463 (100.0%) common/io/tls - 13/13 (100.0%) - 74/74 (100.0%) - 228/228 (100.0%) + 14/14 (100.0%) + 76/76 (100.0%) + 239/239 (100.0%) common/type 227/227 (100.0%) - 490/490 (100.0%) - 2694/2694 (100.0%) + 504/504 (100.0%) + 2708/2708 (100.0%) config - 97/97 (100.0%) - 536/536 (100.0%) - 1379/1379 (100.0%) + 98/98 (100.0%) + 538/538 (100.0%) + 1385/1385 (100.0%) info - 33/33 (100.0%) - 94/94 (100.0%) - 484/484 (100.0%) + 35/35 (100.0%) + 106/106 (100.0%) + 511/511 (100.0%) @@ -154,9 +175,9 @@ postgres - 14/14 (100.0%) - 64/64 (100.0%) - 184/184 (100.0%) + 15/15 (100.0%) + 66/66 (100.0%) + 189/189 (100.0%) @@ -168,9 +189,9 @@ storage - 59/59 (100.0%) - 138/138 (100.0%) - 668/668 (100.0%) + 61/61 (100.0%) + 154/154 (100.0%) + 693/693 (100.0%) @@ -182,28 +203,28 @@ storage/posix - 31/31 (100.0%) - 181/182 (99.45%) - 536/536 (100.0%) + 28/28 (100.0%) + 165/166 (99.40%) + 498/498 (100.0%) storage/remote - 22/22 (100.0%) - 46/46 (100.0%) - 387/387 (100.0%) + 23/23 (100.0%) + 78/78 (100.0%) + 478/478 (100.0%) storage/s3 - 23/23 (100.0%) - 96/96 (100.0%) - 487/487 (100.0%) + 28/28 (100.0%) + 110/110 (100.0%) + 582/582 (100.0%) TOTAL - 910/910 (100.0%) - 3297/3298 (99.97%) - 12282/12282 (100.0%) + 949/949 (100.0%) + 3609/3610 (99.97%) + 13085/13085 (100.0%) \ No newline at end of file diff --git a/doc/xml/release.xml b/doc/xml/release.xml index 792c8d529..e218d01ff 100644 --- a/doc/xml/release.xml +++ b/doc/xml/release.xml @@ -12,7 +12,7 @@ - + diff --git a/lib/pgBackRest/Version.pm b/lib/pgBackRest/Version.pm index 127520530..34e527f75 100644 --- a/lib/pgBackRest/Version.pm +++ b/lib/pgBackRest/Version.pm @@ -39,7 +39,7 @@ push @EXPORT, qw(projectBin projectBinSet); # Defines the current version of the BackRest executable. The version number is used to track features but does not affect what # repositories or manifests can be read - that's the job of the format number. #----------------------------------------------------------------------------------------------------------------------------------- -use constant PROJECT_VERSION => '2.15dev'; +use constant PROJECT_VERSION => '2.15'; push @EXPORT, qw(PROJECT_VERSION); # Repository Format Number diff --git a/src/configure b/src/configure index d557febea..0a94a3bb3 100755 --- a/src/configure +++ b/src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pgBackRest 2.15dev. +# Generated by GNU Autoconf 2.69 for pgBackRest 2.15. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -576,8 +576,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='pgBackRest' PACKAGE_TARNAME='pgbackrest' -PACKAGE_VERSION='2.15dev' -PACKAGE_STRING='pgBackRest 2.15dev' +PACKAGE_VERSION='2.15' +PACKAGE_STRING='pgBackRest 2.15' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1199,7 +1199,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pgBackRest 2.15dev to adapt to many kinds of systems. +\`configure' configures pgBackRest 2.15 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1261,7 +1261,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pgBackRest 2.15dev:";; + short | recursive ) echo "Configuration of pgBackRest 2.15:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pgBackRest configure 2.15dev +pgBackRest configure 2.15 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1449,7 +1449,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pgBackRest $as_me 2.15dev, which was +It was created by pgBackRest $as_me 2.15, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3568,7 +3568,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pgBackRest $as_me 2.15dev, which was +This file was extended by pgBackRest $as_me 2.15, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3630,7 +3630,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pgBackRest config.status 2.15dev +pgBackRest config.status 2.15 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/src/configure.ac b/src/configure.ac index 6b19a4a0c..658158c1e 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,6 +1,6 @@ # Initialize configuration AC_PREREQ([2.69]) -AC_INIT([pgBackRest], [2.15dev]) +AC_INIT([pgBackRest], [2.15]) AC_CONFIG_SRCDIR([version.h]) # Check compiler diff --git a/src/perl/embed.auto.c b/src/perl/embed.auto.c index b7d525fab..ee7dae1f9 100644 --- a/src/perl/embed.auto.c +++ b/src/perl/embed.auto.c @@ -19325,7 +19325,7 @@ static const EmbeddedModule embeddedModule[] = "\n" "push @EXPORT, qw(projectBin projectBinSet);\n" "\n\n\n\n\n\n" - "use constant PROJECT_VERSION => '2.15dev';\n" + "use constant PROJECT_VERSION => '2.15';\n" "push @EXPORT, qw(PROJECT_VERSION);\n" "\n\n\n\n\n\n" "use constant REPOSITORY_FORMAT => 5;\n" diff --git a/src/version.h b/src/version.h index 16fa6f890..c4e65ea2e 100644 --- a/src/version.h +++ b/src/version.h @@ -23,6 +23,6 @@ repository will be invalid unless migration functions are written. /*********************************************************************************************************************************** Software version. Currently this value is maintained in Version.pm and updated by test.pl. ***********************************************************************************************************************************/ -#define PROJECT_VERSION "2.15dev" +#define PROJECT_VERSION "2.15" #endif diff --git a/test/code-count/file-type.yaml b/test/code-count/file-type.yaml index 345641aa7..37f9653f2 100644 --- a/test/code-count/file-type.yaml +++ b/test/code-count/file-type.yaml @@ -135,6 +135,10 @@ doc/xml/dtd/manifest.dtd: class: doc/source type: dtd +doc/xml/faq.xml: + class: doc/source + type: xml + doc/xml/index.xml: class: doc/source type: xml @@ -275,10 +279,6 @@ lib/pgBackRest/DbVersion.pm: class: core type: perl -lib/pgBackRest/Expire.pm: - class: core - type: perl - lib/pgBackRest/InfoCommon.pm: class: core type: perl @@ -571,6 +571,14 @@ src/command/backup/common.h: class: core type: c/h +src/command/backup/pageChecksum.c: + class: core + type: c + +src/command/backup/pageChecksum.h: + class: core + type: c/h + src/command/command.c: class: core type: c @@ -587,6 +595,14 @@ src/command/control/control.h: class: core type: c/h +src/command/expire/expire.c: + class: core + type: c + +src/command/expire/expire.h: + class: core + type: c/h + src/command/help/help.c: class: core type: c @@ -619,6 +635,30 @@ src/command/remote/remote.h: class: core type: c/h +src/command/restore/file.c: + class: core + type: c + +src/command/restore/file.h: + class: core + type: c/h + +src/command/restore/protocol.c: + class: core + type: c + +src/command/restore/protocol.h: + class: core + type: c/h + +src/command/storage/list.c: + class: core + type: c + +src/command/storage/list.h: + class: core + type: c/h + src/common/assert.h: class: core type: c/h @@ -811,6 +851,14 @@ src/common/io/handleWrite.h: class: core type: c/h +src/common/io/http/cache.c: + class: core + type: c + +src/common/io/http/cache.h: + class: core + type: c/h + src/common/io/http/client.c: class: core type: c @@ -1319,14 +1367,6 @@ src/storage/info.h: class: core type: c/h -src/storage/posix/common.c: - class: core - type: c - -src/storage/posix/common.h: - class: core - type: c/h - src/storage/posix/read.c: class: core type: c @@ -1523,6 +1563,22 @@ test/lib/pgBackRestTest/Common/RunTest.pm: class: test/harness type: perl +test/lib/pgBackRestTest/Common/Storage.pm: + class: test/harness + type: perl + +test/lib/pgBackRestTest/Common/StoragePosix.pm: + class: test/harness + type: perl + +test/lib/pgBackRestTest/Common/StoragePosixRead.pm: + class: test/harness + type: perl + +test/lib/pgBackRestTest/Common/StoragePosixWrite.pm: + class: test/harness + type: perl + test/lib/pgBackRestTest/Common/VmTest.pm: class: test/harness type: perl @@ -1779,6 +1835,10 @@ test/src/module/command/controlTest.c: class: test/module type: c +test/src/module/command/expireTest.c: + class: test/module + type: c + test/src/module/command/helpTest.c: class: test/module type: c @@ -1795,6 +1855,14 @@ test/src/module/command/remoteTest.c: class: test/module type: c +test/src/module/command/restoreTest.c: + class: test/module + type: c + +test/src/module/command/storageTest.c: + class: test/module + type: c + test/src/module/common/assertOffTest.c: class: test/module type: c