Merge branch 'master' into issue_106

Author: gsmolk

README.md

@@ -58,15 +58,15 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 ### Linux Installation
 ```shell
 #DEB Ubuntu|Debian Packages
-echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
-wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | apt-key add - && apt-get update
-apt-get install pg-probackup-{11,10,9.6,9.5}
-apt-get install pg-probackup-{11,10,9.6,9.5}-dbg
+sudo echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
+sudo wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
+sudo apt-get install pg-probackup-{11,10,9.6,9.5}
+sudo apt-get install pg-probackup-{11,10,9.6,9.5}-dbg
 
 #DEB-SRC Packages
-echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
+sudo echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
   /etc/apt/sources.list.d/pg_probackup.list
-apt-get source pg-probackup-{11,10,9.6,9.5}
+sudo apt-get source pg-probackup-{11,10,9.6,9.5}
 
 #RPM Centos Packages
 rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
@@ -112,7 +112,7 @@ gen_probackup_project.pl C:\path_to_postgresql_source_tree
 
 ## Documentation
 
-Currently the latest documentation can be found at [github](https://postgrespro.github.io/pg_probackup)
+Currently the latest documentation can be found at [github](https://postgrespro.github.io/pg_probackup).
 Slightly outdated documentation can be found at [Postgres Pro Enterprise documentation](https://postgrespro.com/docs/postgrespro/current/app-pgprobackup).
 
 ## License

src/backup.c

@@ -2493,7 +2493,6 @@ StreamLog(void *arg)
 	stream_arg->startpos -= stream_arg->startpos % instance_config.xlog_seg_size;
 
 	/* Initialize timeout */
-	stream_stop_timeout = 0;
 	stream_stop_begin = 0;
 
 #if PG_VERSION_NUM >= 100000

tests/retention.py

@@ -1,7 +1,7 @@
 import os
 import unittest
 from datetime import datetime, timedelta
-from .helpers.ptrack_helpers import ProbackupTest
+from .helpers.ptrack_helpers import ProbackupTest, ProbackupException
 from time import sleep
 
 
@@ -1459,3 +1459,49 @@ def test_retention_redundancy_overlapping_chains(self):
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)
+
+    def test_agressive_retention_window_purge(self):
+        """
+        https://github.com/postgrespro/pg_probackup/issues/106
+        """
+        fname = self.id().split('.')[3]
+        node = self.make_simple_node(
+            base_dir=os.path.join(module_name, fname, 'node'),
+            initdb_params=['--data-checksums'])
+
+        backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
+        self.init_pb(backup_dir)
+        self.add_instance(backup_dir, 'node', node)
+        node.slow_start()
+
+        # Make ERROR incremental backup
+        try:
+            self.backup_node(backup_dir, 'node', node, backup_type='page')
+            # we should die here because exception is what we expect to happen
+            self.assertEqual(
+                1, 0,
+                "Expecting Error because page backup should not be possible "
+                "without valid full backup.\n Output: {0} \n CMD: {1}".format(
+                    repr(self.output), self.cmd))
+        except ProbackupException as e:
+            self.assertIn(
+                "ERROR: Valid backup on current timeline 1 is not found. "
+                "Create new FULL backup before an incremental one.",
+                e.message,
+                "\n Unexpected Error Message: {0}\n CMD: {1}".format(
+                    repr(e.message), self.cmd))
+
+        page_id = self.show_pb(backup_dir, 'node')[0]['id']
+
+        sleep(1)
+
+        # Make FULL backup
+        self.backup_node(
+            backup_dir, 'node', node,
+            options=['--delete-expired', '--retention-window=1', '--stream'])
+
+        # Check number of backups
+        self.assertEqual(len(self.show_pb(backup_dir, 'node')), 2)
+
+        # Clean after yourself
+        self.del_test_dir(module_name, fname)