@@ -26,7 +26,8 @@ def test_page_vacuum_truncate(self):
2626 pg_options = {
2727 'wal_level' : 'replica' ,
2828 'max_wal_senders' : '2' ,
29- 'checkpoint_timeout' : '300s'
29+ 'checkpoint_timeout' : '300s' ,
30+ 'autovacuum' : 'off'
3031 }
3132 )
3233 node_restored = self .make_simple_node (
@@ -70,8 +71,7 @@ def test_page_vacuum_truncate(self):
7071 )
7172
7273 self .backup_node (
73- backup_dir , 'node' , node , backup_type = 'page' ,
74- options = ['--log-level-file=verbose' ]
74+ backup_dir , 'node' , node , backup_type = 'page'
7575 )
7676
7777 if self .paranoia :
@@ -95,6 +95,21 @@ def test_page_vacuum_truncate(self):
9595 "postgresql.auto.conf" , "port = {0}" .format (node_restored .port ))
9696 node_restored .start ()
9797
98+ while node_restored .safe_psql (
99+ "postgres" , "select pg_is_in_recovery()" ) == 't\n ' :
100+ time .sleep (1 )
101+
102+ # Logical comparison
103+ result1 = node .safe_psql (
104+ "postgres" ,
105+ "select * from t_heap"
106+ )
107+ result2 = node_restored .safe_psql (
108+ "postgres" ,
109+ "select * from t_heap"
110+ )
111+ self .assertEqual (result1 , result2 )
112+
98113 # Clean after yourself
99114 self .del_test_dir (module_name , fname )
100115
@@ -280,12 +295,15 @@ def test_page_multiple_segments(self):
280295 pgdata_restored = self .pgdata_content (restored_node .data_dir )
281296
282297 # START RESTORED NODE
283- restored_node .append_conf ("postgresql.auto.conf" , "port = {0}" .format (restored_node .port ))
298+ restored_node .append_conf (
299+ "postgresql.auto.conf" , "port = {0}" .format (restored_node .port ))
284300 restored_node .start ()
285- while restored_node .safe_psql ("postgres" , "select pg_is_in_recovery()" ) == 't\n ' :
301+ while restored_node .safe_psql (
302+ "postgres" , "select pg_is_in_recovery()" ) == 't\n ' :
286303 time .sleep (1 )
287304
288- result_new = restored_node .safe_psql ("postgres" , "select * from pgbench_accounts" )
305+ result_new = restored_node .safe_psql (
306+ "postgres" , "select * from pgbench_accounts" )
289307
290308 # COMPARE RESTORED FILES
291309 self .assertEqual (result , result_new , 'data is lost' )
0 commit comments