tests: add slow_start() method to PostgresNode

Author: gsmolk

tests/archive.py

@@ -45,10 +45,7 @@ def test_pgpro434_1(self):
 
         self.restore_node(
             backup_dir, 'node', node)
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         # Recreate backup calagoue
         self.init_pb(backup_dir)
@@ -64,10 +61,7 @@ def test_pgpro434_1(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=["--recovery-target-action=promote"])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         self.assertEqual(
             result, node.safe_psql("postgres", "SELECT * FROM t_heap"),
@@ -115,10 +109,8 @@ def test_pgpro434_2(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=['--immediate', '--recovery-target-action=promote'])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
+
         if self.verbose:
             print(node.safe_psql(
                 "postgres",
@@ -149,10 +141,7 @@ def test_pgpro434_2(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=['--immediate', '--recovery-target-action=promote'])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         if self.verbose:
             print(
@@ -180,10 +169,7 @@ def test_pgpro434_2(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=['--immediate', '--recovery-target-action=promote'])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         if self.verbose:
             print('Fourth timeline')
@@ -196,10 +182,8 @@ def test_pgpro434_2(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=['--immediate', '--recovery-target-action=promote'])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
+
         if self.verbose:
             print('Fifth timeline')
             print(node.safe_psql(
@@ -211,10 +195,8 @@ def test_pgpro434_2(self):
         self.restore_node(
             backup_dir, 'node', node,
             options=['--immediate', '--recovery-target-action=promote'])
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
+
         if self.verbose:
             print('Sixth timeline')
             print(node.safe_psql(
@@ -459,7 +441,7 @@ def test_replica_archive(self):
         # Settings for Replica
         self.restore_node(backup_dir, 'master', replica)
         self.set_replica(master, replica, synchronous=True)
-        exit(1)
+
         self.add_instance(backup_dir, 'replica', replica)
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
         replica.start()
@@ -768,10 +750,7 @@ def test_archive_pg_receivexlog(self):
         # Check data correctness
         node.cleanup()
         self.restore_node(backup_dir, 'node', node)
-        node.start()
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         self.assertEqual(
             result,
@@ -843,11 +822,7 @@ def test_archive_pg_receivexlog_compression_pg10(self):
         # Check data correctness
         node.cleanup()
         self.restore_node(backup_dir, 'node', node)
-        node.start()
-
-        while node.psql(
-                "postgres", "select pg_is_in_recovery()")[0] != 0:
-            sleep(1)
+        node.slow_start()
 
         self.assertEqual(
             result, node.safe_psql("postgres", "SELECT * FROM t_heap"),

tests/compression.py

@@ -83,7 +83,8 @@ def test_compression_stream_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         full_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(full_result, full_result_new)
         node.cleanup()
@@ -98,7 +99,8 @@ def test_compression_stream_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         page_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(page_result, page_result_new)
         node.cleanup()
@@ -113,7 +115,8 @@ def test_compression_stream_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         ptrack_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(ptrack_result, ptrack_result_new)
         node.cleanup()
@@ -187,7 +190,8 @@ def test_compression_archive_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         full_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(full_result, full_result_new)
         node.cleanup()
@@ -202,7 +206,8 @@ def test_compression_archive_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         page_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(page_result, page_result_new)
         node.cleanup()
@@ -217,7 +222,8 @@ def test_compression_archive_zlib(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         ptrack_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(ptrack_result, ptrack_result_new)
         node.cleanup()
@@ -294,7 +300,8 @@ def test_compression_stream_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         full_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(full_result, full_result_new)
         node.cleanup()
@@ -309,7 +316,8 @@ def test_compression_stream_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         page_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(page_result, page_result_new)
         node.cleanup()
@@ -324,7 +332,8 @@ def test_compression_stream_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         ptrack_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(ptrack_result, ptrack_result_new)
         node.cleanup()
@@ -401,7 +410,8 @@ def test_compression_archive_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         full_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(full_result, full_result_new)
         node.cleanup()
@@ -416,7 +426,8 @@ def test_compression_archive_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         page_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(page_result, page_result_new)
         node.cleanup()
@@ -431,7 +442,8 @@ def test_compression_archive_pglz(self):
                     "--recovery-target-action=promote"]),
             '\n Unexpected Error Message: {0}\n CMD: {1}'.format(
                 repr(self.output), self.cmd))
-        node.start()
+        node.slow_start()
+
         ptrack_result_new = node.execute("postgres", "SELECT * FROM t_heap")
         self.assertEqual(ptrack_result, ptrack_result_new)
         node.cleanup()

tests/delta.py

@@ -508,10 +508,7 @@ def test_delta_multiple_segments(self):
         # START RESTORED NODE
         restored_node.append_conf(
             "postgresql.auto.conf", "port = {0}".format(restored_node.port))
-        restored_node.start()
-        while restored_node.safe_psql(
-                "postgres", "select pg_is_in_recovery()") == 't\n':
-            time.sleep(1)
+        restored_node.slow_start()
 
         result_new = restored_node.safe_psql(
             "postgres", "select * from pgbench_accounts")
@@ -946,11 +943,8 @@ def test_alter_table_set_tablespace_delta(self):
         # START RESTORED NODE
         node_restored.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node_restored.port))
-        node_restored.start()
+        node_restored.slow_start()
 
-        while node_restored.safe_psql(
-                "postgres", "select pg_is_in_recovery()") == 't\n':
-            time.sleep(1)
         result_new = node_restored.safe_psql(
             "postgres", "select * from t_heap")
 

tests/expected/option_help.out

@@ -25,6 +25,7 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
                  [--replica-timeout=timeout]
 
   pg_probackup show-config -B backup-dir --instance=instance_name
+                 [--format=format]
 
   pg_probackup backup -B backup-path -b backup-mode --instance=instance_name
                  [-C] [--stream [-S slot-name]] [--backup-pg-log]
@@ -61,10 +62,12 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
   pg_probackup validate -B backup-dir [--instance=instance_name]
                  [-i backup-id] [--progress]
                  [--time=time|--xid=xid [--inclusive=boolean]]
+                 [--recovery-target-name=target-name]
                  [--timeline=timeline]
 
   pg_probackup show -B backup-dir
                  [--instance=instance_name [-i backup-id]]
+                 [--format=format]
 
   pg_probackup delete -B backup-dir --instance=instance_name
                  [--wal] [-i backup-id | --expired]

tests/false_positive.py

@@ -191,7 +191,7 @@ def test_ptrack_concurrent_get_and_clear_1(self):
                 node.data_dir, ignore_ptrack=False)
             self.compare_pgdata(pgdata, pgdata_restored)
 
-        node.start()
+        node.slow_start()
         # Logical comparison
         self.assertEqual(
             result,
@@ -290,7 +290,7 @@ def test_ptrack_concurrent_get_and_clear_2(self):
                 node.data_dir, ignore_ptrack=False)
             self.compare_pgdata(pgdata, pgdata_restored)
 
-        node.start()
+        node.slow_start()
         # Logical comparison
         self.assertEqual(
             result,

tests/helpers/ptrack_helpers.py

@@ -112,6 +112,25 @@ def __str__(self):
         return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd)
 
 
+def slow_start(self):
+
+    # wait for https://github.com/postgrespro/testgres/pull/50
+    # self.poll_query_until(
+    #    "postgres",
+    #    "SELECT not pg_is_in_recovery()",
+    #    raise_operational_error=False)
+
+    self.start()
+    while True:
+        try:
+            self.poll_query_until(
+                "postgres",
+                "SELECT not pg_is_in_recovery()")
+            break
+        except Exception as e:
+            continue
+
+
 class ProbackupTest(object):
     # Class attributes
     enterprise = is_enterprise()
@@ -205,6 +224,8 @@ def make_simple_node(
         os.makedirs(real_base_dir)
 
         node = testgres.get_new_node('test', base_dir=real_base_dir)
+        # bound method slow_start() to 'node' class instance
+        node.slow_start = slow_start.__get__(node)
         node.should_rm_dirs = True
         node.init(
            initdb_params=initdb_params, allow_streaming=set_replication)