tests: fix ptrack_cluster

gsmolk · gsmolk · commit 9ec6357a0aad · 2018-10-17T18:11:53.000+03:00
diff --git a/tests/ptrack_cluster.py b/tests/ptrack_cluster.py
@@ -218,6 +218,12 @@ def test_ptrack_cluster_on_btree_replica(self):
         master.safe_psql('postgres', 'vacuum t_heap')
         master.safe_psql('postgres', 'checkpoint')
 
+        self.backup_node(
+            backup_dir, 'replica', replica, options=[
+                '-j10', '--stream', '--master-host=localhost',
+                '--master-db=postgres', '--master-port={0}'.format(
+                    master.port)])
+
         for i in idx_ptrack:
             # get size of heap and indexes. size calculated in pages
             idx_ptrack[i]['old_size'] = self.get_fork_size(replica, i)
@@ -227,16 +233,19 @@ def test_ptrack_cluster_on_btree_replica(self):
             idx_ptrack[i]['old_pages'] = self.get_md5_per_page_for_fork(
                 idx_ptrack[i]['path'], idx_ptrack[i]['old_size'])
 
-        self.backup_node(
-            backup_dir, 'replica', replica, options=[
-                '-j10', '--stream', '--master-host=localhost',
-                '--master-db=postgres', '--master-port={0}'.format(
-                    master.port)])
-
         master.safe_psql('postgres', 'delete from t_heap where id%2 = 1')
         master.safe_psql('postgres', 'cluster t_heap using t_btree')
         master.safe_psql('postgres', 'checkpoint')
 
+        # Sync master and replica
+        lsn = master.safe_psql(
+            'postgres', 'SELECT pg_catalog.pg_current_wal_lsn()').rstrip()
+        replica.poll_query_until(
+            "postgres",
+            "SELECT '{0}'::pg_lsn <= pg_last_wal_replay_lsn()".format(
+                lsn))
+        replica.safe_psql('postgres', 'checkpoint')
+
         # CHECK PTRACK SANITY
         success = True
         for i in idx_ptrack:
@@ -322,6 +331,12 @@ def test_ptrack_cluster_on_gist_replica(self):
                 lsn))
         replica.safe_psql('postgres', 'checkpoint')
 
+        self.backup_node(
+            backup_dir, 'replica', replica, options=[
+                '-j10', '--stream', '--master-host=localhost',
+                '--master-db=postgres', '--master-port={0}'.format(
+                    master.port)])
+
         for i in idx_ptrack:
             # get size of heap and indexes. size calculated in pages
             idx_ptrack[i]['old_size'] = self.get_fork_size(replica, i)
@@ -331,12 +346,6 @@ def test_ptrack_cluster_on_gist_replica(self):
             idx_ptrack[i]['old_pages'] = self.get_md5_per_page_for_fork(
                 idx_ptrack[i]['path'], idx_ptrack[i]['old_size'])
 
-        self.backup_node(
-            backup_dir, 'replica', replica, options=[
-                '-j10', '--stream', '--master-host=localhost',
-                '--master-db=postgres', '--master-port={0}'.format(
-                    master.port)])
-
         master.safe_psql('postgres', 'delete from t_heap where id%2 = 1')
         master.safe_psql('postgres', 'cluster t_heap using t_gist')
         master.safe_psql('postgres', 'checkpoint')
