tests: some more of ptrack fixes

gsmolk · gsmolk · commit 3088f4fbf243 · 2018-10-17T12:56:03.000+03:00
diff --git a/tests/ptrack_truncate.py b/tests/ptrack_truncate.py
@@ -60,6 +60,7 @@ def test_ptrack_truncate(self):
         # Make full backup to clean every ptrack
         self.backup_node(
             backup_dir, 'node', node, options=['-j10', '--stream'])
+
         for i in idx_ptrack:
             idx_ptrack[i]['ptrack'] = self.get_ptrack_bits_per_page_for_fork(
                 node, idx_ptrack[i]['path'], [idx_ptrack[i]['old_size']])
@@ -100,6 +101,7 @@ def test_ptrack_truncate_replica(self):
         replica.start()
 
         # Create table and indexes
+        self.create_tblspace_in_node(master, 'somedata')
         master.safe_psql(
             "postgres",
             "create sequence t_seq; create table t_heap tablespace somedata "
@@ -114,9 +116,6 @@ def test_ptrack_truncate_replica(self):
                         i, idx_ptrack[i]['relation'],
                         idx_ptrack[i]['type'], idx_ptrack[i]['column']))
 
-        replica.safe_psql('postgres', 'truncate t_heap')
-        replica.safe_psql('postgres', 'checkpoint')
-
         # Sync master and replica
         lsn = master.safe_psql(
             'postgres', 'SELECT pg_catalog.pg_current_wal_lsn()').rstrip()
@@ -143,9 +142,7 @@ def test_ptrack_truncate_replica(self):
                 replica, idx_ptrack[i]['path'], [idx_ptrack[i]['old_size']])
             self.check_ptrack_clean(idx_ptrack[i], idx_ptrack[i]['old_size'])
 
-        # Delete some rows, vacuum it and make checkpoint
-        master.safe_psql('postgres', 'delete from t_heap where id%2 = 1')
-        master.safe_psql('postgres', 'vacuum t_heap')
+        master.safe_psql('postgres', 'truncate t_heap')
         master.safe_psql('postgres', 'checkpoint')
 
         # Sync master and replica
diff --git a/tests/ptrack_vacuum_bits_visibility.py b/tests/ptrack_vacuum_bits_visibility.py
@@ -47,15 +47,6 @@ def test_ptrack_vacuum_bits_visibility(self):
 
         node.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')
-
         for i in idx_ptrack:
             # get size of heap and indexes. size calculated in pages
             idx_ptrack[i]['old_size'] = self.get_fork_size(node, i)
@@ -71,15 +62,6 @@ def test_ptrack_vacuum_bits_visibility(self):
         node.safe_psql('postgres', 'vacuum t_heap')
         node.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:
