Merge branch 'release_2_4' into issue_228

Author: gsmolk

src/pg_probackup.h

@@ -95,7 +95,7 @@ extern const char  *PROGRAM_EMAIL;
 #define OUT_BUF_SIZE (512 * 1024)
 
 /* retry attempts */
-#define PAGE_READ_ATTEMPTS 100
+#define PAGE_READ_ATTEMPTS 300
 
 /* max size of note, that can be added to backup */
 #define MAX_NOTE_SIZE 1024

tests/archive.py

@@ -976,7 +976,7 @@ def test_basic_master_and_replica_concurrent_archiving(self):
         self.backup_node(backup_dir, 'master', replica)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, nodes=[master, replica])
 
     # @unittest.expectedFailure
     # @unittest.skip("skip")

tests/backup.py

@@ -1070,7 +1070,7 @@ def test_basic_tablespace_handling(self):
             self.compare_pgdata(pgdata, pgdata_restored)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, nodes=[node])
 
     # @unittest.skip("skip")
     def test_tablespace_handling_1(self):
@@ -1603,7 +1603,7 @@ def test_basic_temp_slot_for_stream_backup(self):
             options=['--stream', '--slot=slot_1', '--temp-slot'])
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_backup_concurrent_drop_table(self):
@@ -1648,7 +1648,7 @@ def test_backup_concurrent_drop_table(self):
         self.assertEqual(show_backup['status'], "OK")
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, nodes=[node])
 
     # @unittest.skip("skip")
     def test_pg_11_adjusted_wal_segment_size(self):
@@ -1932,7 +1932,7 @@ def test_basic_missing_file_permissions(self):
         os.chmod(full_path, 700)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_basic_missing_dir_permissions(self):
@@ -1975,7 +1975,7 @@ def test_basic_missing_dir_permissions(self):
         os.chmod(full_path, 700)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_backup_with_least_privileges_role(self):

tests/checkdb.py

@@ -348,7 +348,7 @@ def test_basic_checkdb_amcheck_only_sanity(self):
                 log_file_content)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_checkdb_block_validation_sanity(self):

tests/compression.py

@@ -115,10 +115,9 @@ def test_basic_compression_stream_zlib(self):
 
         delta_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(delta_result, delta_result_new)
-        node.cleanup()
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     def test_compression_archive_zlib(self):
         """

tests/delta.py

@@ -45,39 +45,32 @@ def test_basic_delta_vacuum_truncate(self):
             "create table t_heap as select i as id, "
             "md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,1024) i;"
-        )
+            "from generate_series(0,1024) i;")
 
         node.safe_psql(
             "postgres",
-            "vacuum t_heap"
-        )
+            "vacuum t_heap")
 
         self.backup_node(backup_dir, 'node', node, options=['--stream'])
 
         node.safe_psql(
             "postgres",
-            "delete from t_heap where ctid >= '(11,0)'"
-        )
+            "delete from t_heap where ctid >= '(11,0)'")
 
         node.safe_psql(
             "postgres",
-            "vacuum t_heap"
-        )
+            "vacuum t_heap")
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='delta'
-        )
+            backup_dir, 'node', node, backup_type='delta')
 
         self.backup_node(
-            backup_dir, 'node', node, backup_type='delta'
-        )
+            backup_dir, 'node', node, backup_type='delta')
 
         pgdata = self.pgdata_content(node.data_dir)
 
         self.restore_node(
-            backup_dir, 'node', node_restored
-        )
+            backup_dir, 'node', node_restored)
 
         # Physical comparison
         pgdata_restored = self.pgdata_content(node_restored.data_dir)
@@ -87,7 +80,7 @@ def test_basic_delta_vacuum_truncate(self):
         node_restored.slow_start()
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node, node_restored])
 
     # @unittest.skip("skip")
     def test_delta_vacuum_truncate_1(self):

tests/helpers/ptrack_helpers.py

@@ -1448,13 +1448,16 @@ def get_version(self, node):
     def get_bin_path(self, binary):
         return testgres.get_bin_path(binary)
 
-    def del_test_dir(self, module_name, fname):
+    def del_test_dir(self, module_name, fname, nodes=[]):
         """ Del testdir and optimistically try to del module dir"""
         try:
             testgres.clean_all()
         except:
             pass
 
+        for node in nodes:
+            node.stop()
+
         shutil.rmtree(
             os.path.join(
                 self.tmp_path,

tests/merge.py

@@ -100,8 +100,7 @@ def test_basic_merge_full_page(self):
         self.assertEqual(count1, count2)
 
         # Clean after yourself
-        node.cleanup()
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     def test_merge_compressed_backups(self):
         """

tests/page.py

@@ -100,7 +100,7 @@ def test_basic_page_vacuum_truncate(self):
         self.assertEqual(result1, result2)
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node, node_restored])
 
     # @unittest.skip("skip")
     def test_page_vacuum_truncate_1(self):

tests/replica.py

@@ -340,7 +340,7 @@ def test_basic_make_replica_via_restore(self):
             options=['--archive-timeout=30s', '--stream'])
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [master, replica])
 
     # @unittest.skip("skip")
     def test_take_backup_from_delayed_replica(self):

tests/retention.py

@@ -1009,7 +1009,7 @@ def test_basic_window_merge_multiple_descendants(self):
             'FULL')
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_basic_window_merge_multiple_descendants_1(self):
@@ -1276,7 +1276,7 @@ def test_basic_window_merge_multiple_descendants_1(self):
                 '--delete-expired', '--log-level-console=log'])
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_window_chains(self):
@@ -2534,4 +2534,4 @@ def test_basic_wal_depth(self):
 
         self.validate_pb(backup_dir, 'node')
 
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])

tests/validate.py

@@ -298,7 +298,7 @@ def test_basic_validate_corrupted_intermediate_backup(self):
             'Backup STATUS should be "ORPHAN"')
 
         # Clean after yourself
-        self.del_test_dir(module_name, fname)
+        self.del_test_dir(module_name, fname, [node])
 
     # @unittest.skip("skip")
     def test_validate_corrupted_intermediate_backups(self):