add replica flag in slow_start() method

Author: gsmolk

tests/archive.py

@@ -29,7 +29,7 @@ def test_pgpro434_1(self):
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
         self.set_archiving(backup_dir, 'node', node)
-        node.start()
+        node.slow_start()
 
         node.safe_psql(
             "postgres",
@@ -89,7 +89,7 @@ def test_pgpro434_2(self):
         self.init_pb(backup_dir)
         self.add_instance(backup_dir, 'node', node)
         self.set_archiving(backup_dir, 'node', node)
-        node.start()
+        node.slow_start()
 
         # FIRST TIMELINE
         node.safe_psql(
@@ -247,7 +247,7 @@ def test_pgpro434_3(self):
         node.append_conf(
             'postgresql.auto.conf', "archive_command  = '{0} %p %f'".format(
                 archive_script_path))
-        node.start()
+        node.slow_start()
         try:
             self.backup_node(
                 backup_dir, 'node', node,
@@ -308,7 +308,7 @@ def test_arhive_push_file_exists(self):
             f.flush()
             f.close()
 
-        node.start()
+        node.slow_start()
         node.safe_psql(
             "postgres",
             "create table t_heap as select i as id, md5(i::text) as text, "
@@ -368,7 +368,7 @@ def test_arhive_push_file_exists_overwrite(self):
             f.flush()
             f.close()
 
-        node.start()
+        node.slow_start()
         node.safe_psql(
             "postgres",
             "create table t_heap as select i as id, md5(i::text) as text, "
@@ -423,7 +423,7 @@ def test_replica_archive(self):
         self.init_pb(backup_dir)
         # ADD INSTANCE 'MASTER'
         self.add_instance(backup_dir, 'master', master)
-        master.start()
+        master.slow_start()
 
         replica = self.make_simple_node(
             base_dir="{0}/{1}/replica".format(module_name, fname))
@@ -444,7 +444,7 @@ def test_replica_archive(self):
 
         self.add_instance(backup_dir, 'replica', replica)
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
-        replica.start()
+        replica.slow_start(replica=True)
 
         # Check data correctness on replica
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -481,7 +481,7 @@ def test_replica_archive(self):
         self.restore_node(backup_dir, 'replica', data_dir=node.data_dir)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -513,7 +513,7 @@ def test_replica_archive(self):
             backup_dir, 'replica', data_dir=node.data_dir, backup_id=backup_id)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -547,7 +547,7 @@ def test_master_and_replica_parallel_archiving(self):
         # ADD INSTANCE 'MASTER'
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
-        master.start()
+        master.slow_start()
 
         master.psql(
             "postgres",
@@ -573,7 +573,7 @@ def test_master_and_replica_parallel_archiving(self):
         self.add_instance(backup_dir, 'replica', replica)
         # SET ARCHIVING FOR REPLICA
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
-        replica.start()
+        replica.slow_start(replica=True)
 
         # CHECK LOGICAL CORRECTNESS on REPLICA
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -628,7 +628,7 @@ def test_master_and_replica_concurrent_archiving(self):
         # ADD INSTANCE 'MASTER'
         self.add_instance(backup_dir, 'master', master)
         self.set_archiving(backup_dir, 'master', master)
-        master.start()
+        master.slow_start()
 
         master.psql(
             "postgres",
@@ -655,7 +655,7 @@ def test_master_and_replica_concurrent_archiving(self):
         # self.add_instance(backup_dir, 'replica', replica)
         # SET ARCHIVING FOR REPLICA
         # self.set_archiving(backup_dir, 'replica', replica, replica=True)
-        replica.start()
+        replica.slow_start(replica=True)
 
         # CHECK LOGICAL CORRECTNESS on REPLICA
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")

tests/helpers/ptrack_helpers.py

@@ -112,7 +112,7 @@ def __str__(self):
         return '\n ERROR: {0}\n CMD: {1}'.format(repr(self.message), self.cmd)
 
 
-def slow_start(self):
+def slow_start(self, replica=False):
 
     # wait for https://github.com/postgrespro/testgres/pull/50
     # self.poll_query_until(
@@ -121,14 +121,24 @@ def slow_start(self):
     #    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
+    if not replica:
+        while True:
+            try:
+                self.poll_query_until(
+                    "postgres",
+                    "SELECT not pg_is_in_recovery()")
+                break
+            except Exception as e:
+                continue
+    else:
+        while True:
+            try:
+                self.poll_query_until(
+                    "postgres",
+                    "SELECT pg_is_in_recovery()")
+                break
+            except Exception as e:
+                continue
 
 
 class ProbackupTest(object):

tests/replica.py

@@ -50,7 +50,7 @@ def test_replica_stream_ptrack_backup(self):
         self.set_replica(master, replica)
 
         # Check data correctness on replica
-        replica.start(["-t", "600"])
+        replica.slow_start(replica=True)
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
 
@@ -82,7 +82,7 @@ def test_replica_stream_ptrack_backup(self):
         self.restore_node(backup_dir, 'replica', data_dir=node.data_dir)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -113,7 +113,7 @@ def test_replica_stream_ptrack_backup(self):
             backup_dir, 'replica', data_dir=node.data_dir, backup_id=backup_id)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -143,7 +143,7 @@ def test_replica_archive_page_backup(self):
         self.set_archiving(backup_dir, 'master', master)
         # force more frequent wal switch
         master.append_conf('postgresql.auto.conf', 'archive_timeout  = 10')
-        master.start()
+        master.slow_start()
 
         replica = self.make_simple_node(
             base_dir="{0}/{1}/replica".format(module_name, fname))
@@ -166,7 +166,7 @@ def test_replica_archive_page_backup(self):
         # Settings for Replica
         self.set_replica(master, replica)
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
-        replica.start(["-t", "600"])
+        replica.slow_start(replica=True)
 
         # Check data correctness on replica
         after = replica.safe_psql("postgres", "SELECT * FROM t_heap")
@@ -200,7 +200,7 @@ def test_replica_archive_page_backup(self):
         self.restore_node(backup_dir, 'replica', data_dir=node.data_dir)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -231,7 +231,7 @@ def test_replica_archive_page_backup(self):
             backup_dir, 'replica', data_dir=node.data_dir, backup_id=backup_id)
         node.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(node.port))
-        node.start()
+        node.slow_start()
         # CHECK DATA CORRECTNESS
         after = node.safe_psql("postgres", "SELECT * FROM t_heap")
         self.assertEqual(before, after)
@@ -260,7 +260,7 @@ def test_make_replica_via_restore(self):
         self.set_archiving(backup_dir, 'master', master)
         # force more frequent wal switch
         master.append_conf('postgresql.auto.conf', 'archive_timeout  = 10')
-        master.start()
+        master.slow_start()
 
         replica = self.make_simple_node(
             base_dir="{0}/{1}/replica".format(module_name, fname))
@@ -287,15 +287,7 @@ def test_make_replica_via_restore(self):
         self.set_archiving(backup_dir, 'replica', replica, replica=True)
         replica.append_conf(
             'postgresql.auto.conf', 'port = {0}'.format(replica.port))
-        replica.start(["-t", "600"])
-
-        time.sleep(1)
-        self.assertEqual(
-            master.safe_psql(
-                "postgres",
-                "select exists(select * from pg_stat_replication)"
-                ).rstrip(),
-            't')
+        replica.slow_start(replica=True)
 
         # Clean after yourself
         self.del_test_dir(module_name, fname)