Merge branch 'master' into release_2.1.3

Author: gsmolk

Diff for: README.md

@@ -55,6 +55,7 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 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
 
 #DEB-SRC Packages
 echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
@@ -64,14 +65,17 @@ 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
 yum install pg_probackup-{11,10,9.6,9.5}
+yum install pg_probackup-{11,10,9.6,9.5}-debuginfo
 
 #RPM RHEL Packages
 rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
 yum install pg_probackup-{11,10,9.6,9.5}
+yum install pg_probackup-{11,10,9.6,9.5}-debuginfo
 
 #RPM Oracle Linux Packages
 rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
 yum install pg_probackup-{11,10,9.6,9.5}
+yum install pg_probackup-{11,10,9.6,9.5}-debuginfo
 
 #SRPM Packages
 yumdownloader --source pg_probackup-{11,10,9.6,9.5}

Diff for: tests/merge.py

@@ -176,7 +176,7 @@ def test_merge_compressed_backups_1(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"],
+            set_replication=True, initdb_params=["--data-checksums"],
             pg_options={
                 'autovacuum': 'off'
             }
@@ -253,7 +253,7 @@ def test_merge_compressed_and_uncompressed_backups(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"],
+            set_replication=True, initdb_params=["--data-checksums"],
             pg_options={
                 'autovacuum': 'off'
             }
@@ -329,7 +329,7 @@ def test_merge_compressed_and_uncompressed_backups_1(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"],
+            set_replication=True, initdb_params=["--data-checksums"],
             pg_options={
                 'autovacuum': 'off'
             }
@@ -406,7 +406,7 @@ def test_merge_compressed_and_uncompressed_backups_2(self):
         # Initialize instance and backup directory
         node = self.make_simple_node(
             base_dir=os.path.join(module_name, fname, 'node'),
-            initdb_params=["--data-checksums"],
+            set_replication=True, initdb_params=["--data-checksums"],
             pg_options={
                 'autovacuum': 'off'
             }
@@ -1734,14 +1734,22 @@ def test_failed_merge_after_delete(self):
             backup_dir, 'backups', 'node',
             full_id, 'database', 'base', dboid)
 
-        self.merge_backup(
-            backup_dir, 'node', page_id_2,
-            options=['--log-level-console=verbose'])
-
-        #self.assertFalse(
-        #    os.path.isdir(db_path),
-        #    'Directory {0} should not exist'.format(
-        #        db_path, full_id))
+        try:
+            self.merge_backup(
+                backup_dir, 'node', page_id_2,
+                options=['--log-level-console=verbose'])
+            self.assertEqual(
+                    1, 0,
+                    "Expecting Error because of missing parent.\n "
+                    "Output: {0} \n CMD: {1}".format(
+                        repr(self.output), self.cmd))
+        except ProbackupException as e:
+            self.assertTrue(
+                "ERROR: Parent full backup for the given "
+                "backup {0} was not found".format(
+                    page_id_2) in e.message,
+                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                    repr(e.message), self.cmd))
 
         self.del_test_dir(module_name, fname)
 
@@ -1798,22 +1806,26 @@ def test_failed_merge_after_delete_1(self):
 
         gdb.set_breakpoint('pgFileDelete')
         gdb.continue_execution_until_break(30)
-
         gdb._execute('signal SIGKILL')
 
-        # backup half-merged
-        #self.assertEqual(
-        #    'MERGING', self.show_pb(backup_dir, 'node')[0]['status'])
-
         self.assertEqual(
             full_id, self.show_pb(backup_dir, 'node')[0]['id'])
 
         # restore
         node.cleanup()
-        self.restore_node(backup_dir, 'node', node)
-
-        pgdata_restored = self.pgdata_content(node.data_dir)
-        self.compare_pgdata(pgdata, pgdata_restored)
+        try:
+            self.restore_node(backup_dir, 'node', node)
+            self.assertEqual(
+                    1, 0,
+                    "Expecting Error because of orphan status.\n "
+                    "Output: {0} \n CMD: {1}".format(
+                        repr(self.output), self.cmd))
+        except ProbackupException as e:
+            self.assertIn(
+                "ERROR: Backup {0} is orphan".format(page_1),
+                e.message,
+                '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
+                    repr(e.message), self.cmd))
 
         self.del_test_dir(module_name, fname)
 

Diff for: tests/pgpro2068.py

@@ -26,7 +26,7 @@ def test_minrecpoint_on_replica(self):
                 # 'checkpoint_timeout': '60min',
                 'checkpoint_completion_target': '0.9',
                 'bgwriter_delay': '10ms',
-                'bgwriter_lru_maxpages': '2000',
+                'bgwriter_lru_maxpages': '1000',
                 'bgwriter_lru_multiplier': '4.0',
                 'max_wal_size': '256MB'})