Skip to content

Commit f8f9e47

Browse files
gsmolkgsmolk
committed
tests: check _ptrack files absense in restored pgdata
1 parent 9fd5a22 commit f8f9e47

File tree

3 files changed

+37
-26
lines changed

3 files changed

+37
-26
lines changed

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -884,7 +884,7 @@ def del_test_dir(self, module_name, fname):
884884
except:
885885
pass
886886

887-
def pgdata_content(self, directory):
887+
def pgdata_content(self, directory, ignore_ptrack=True):
888888
""" return dict with directory content. "
889889
" TAKE IT AFTER CHECKPOINT or BACKUP"""
890890
dirs_to_ignore = [
@@ -897,9 +897,9 @@ def pgdata_content(self, directory):
897897
'backup_label', 'tablespace_map', 'recovery.conf',
898898
'ptrack_control', 'ptrack_init', 'pg_control'
899899
]
900-
suffixes_to_ignore = (
901-
'_ptrack'
902-
)
900+
# suffixes_to_ignore = (
901+
# '_ptrack'
902+
# )
903903
directory_dict = {}
904904
directory_dict['pgdata'] = directory
905905
directory_dict['files'] = {}
@@ -908,7 +908,7 @@ def pgdata_content(self, directory):
908908
for file in files:
909909
if (
910910
file in files_to_ignore or
911-
file.endswith(suffixes_to_ignore)
911+
(ignore_ptrack and file.endswith('_ptrack'))
912912
):
913913
continue
914914

‎tests/page.py‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,20 @@ def test_page_multiple_segments(self):
250250
"""Make node, create table with multiple segments, write some data to it, check page and data correctness"""
251251
fname = self.id().split('.')[3]
252252
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
253-
node = self.make_simple_node(base_dir="{0}/{1}/node".format(module_name, fname),
253+
node = self.make_simple_node(
254+
base_dir="{0}/{1}/node".format(module_name, fname),
254255
set_replication=True,
255256
initdb_params=['--data-checksums'],
256-
pg_options={'wal_level': 'replica', 'max_wal_senders': '2',
257-
'ptrack_enable': 'on', 'fsync': 'off', 'shared_buffers': '1GB',
258-
'maintenance_work_mem': '1GB', 'autovacuum': 'off', 'full_page_writes': 'off'}
257+
pg_options={
258+
'wal_level': 'replica',
259+
'max_wal_senders': '2',
260+
'ptrack_enable': 'on',
261+
'fsync': 'off',
262+
'shared_buffers': '1GB',
263+
'maintenance_work_mem': '1GB',
264+
'autovacuum': 'off',
265+
'full_page_writes': 'off'
266+
}
259267
)
260268

261269
self.init_pb(backup_dir)
@@ -271,7 +279,7 @@ def test_page_multiple_segments(self):
271279
self.backup_node(backup_dir, 'node', node)
272280

273281
# PGBENCH STUFF
274-
pgbench = node.pgbench(options=['-T', '150', '-c', '2', '--no-vacuum'])
282+
pgbench = node.pgbench(options=['-T', '50', '-c', '1', '--no-vacuum'])
275283
pgbench.wait()
276284
node.safe_psql("postgres", "checkpoint")
277285

‎tests/ptrack.py‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def test_ptrack_uncommited_xact(self):
172172

173173
# Physical comparison
174174
if self.paranoia:
175-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
175+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
176176
self.compare_pgdata(pgdata, pgdata_restored)
177177

178178
node_restored.append_conf(
@@ -268,7 +268,7 @@ def test_ptrack_vacuum_full(self):
268268

269269
# Physical comparison
270270
if self.paranoia:
271-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
271+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
272272
self.compare_pgdata(pgdata, pgdata_restored)
273273

274274
node_restored.append_conf(
@@ -358,7 +358,10 @@ def test_ptrack_vacuum_truncate(self):
358358

359359
# Physical comparison
360360
if self.paranoia:
361-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
361+
pgdata_restored = self.pgdata_content(
362+
node_restored.data_dir,
363+
ignore_ptrack=False
364+
)
362365
self.compare_pgdata(pgdata, pgdata_restored)
363366

364367
node_restored.append_conf(
@@ -427,7 +430,7 @@ def test_ptrack_simple(self):
427430

428431
# Physical comparison
429432
if self.paranoia:
430-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
433+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
431434
self.compare_pgdata(pgdata, pgdata_restored)
432435

433436
node_restored.append_conf(
@@ -500,7 +503,7 @@ def test_ptrack_get_block(self):
500503

501504
# Physical comparison
502505
if self.paranoia:
503-
pgdata_restored = self.pgdata_content(node.data_dir)
506+
pgdata_restored = self.pgdata_content(node.data_dir, ignore_ptrack=False)
504507
self.compare_pgdata(pgdata, pgdata_restored)
505508

506509
node.start()
@@ -584,7 +587,7 @@ def test_ptrack_concurrent_get_and_clear_1(self):
584587

585588
# Physical comparison
586589
if self.paranoia:
587-
pgdata_restored = self.pgdata_content(node.data_dir)
590+
pgdata_restored = self.pgdata_content(node.data_dir, ignore_ptrack=False)
588591
self.compare_pgdata(pgdata, pgdata_restored)
589592

590593
node.start()
@@ -682,7 +685,7 @@ def test_ptrack_concurrent_get_and_clear_2(self):
682685

683686
# Physical comparison
684687
if self.paranoia:
685-
pgdata_restored = self.pgdata_content(node.data_dir)
688+
pgdata_restored = self.pgdata_content(node.data_dir, ignore_ptrack=False)
686689
self.compare_pgdata(pgdata, pgdata_restored)
687690

688691
node.start()
@@ -783,7 +786,7 @@ def test_ptrack_stream(self):
783786
)
784787

785788
if self.paranoia:
786-
pgdata_restored = self.pgdata_content(node.data_dir)
789+
pgdata_restored = self.pgdata_content(node.data_dir, ignore_ptrack=False)
787790
self.compare_pgdata(pgdata, pgdata_restored)
788791

789792
node.start()
@@ -885,7 +888,7 @@ def test_ptrack_archive(self):
885888
)
886889

887890
if self.paranoia:
888-
pgdata_restored = self.pgdata_content(node.data_dir)
891+
pgdata_restored = self.pgdata_content(node.data_dir, ignore_ptrack=False)
889892
self.compare_pgdata(pgdata, pgdata_restored)
890893

891894
node.start()
@@ -1191,7 +1194,7 @@ def test_create_db(self):
11911194

11921195
# COMPARE PHYSICAL CONTENT
11931196
if self.paranoia:
1194-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
1197+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
11951198
self.compare_pgdata(pgdata, pgdata_restored)
11961199

11971200
# START RESTORED NODE
@@ -1220,7 +1223,7 @@ def test_create_db(self):
12201223

12211224
# COMPARE PHYSICAL CONTENT
12221225
if self.paranoia:
1223-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
1226+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
12241227
self.compare_pgdata(pgdata, pgdata_restored)
12251228

12261229
# START RESTORED NODE
@@ -1324,7 +1327,7 @@ def test_alter_table_set_tablespace_ptrack(self):
13241327

13251328
# GET RESTORED PGDATA AND COMPARE
13261329
if self.paranoia:
1327-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
1330+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
13281331
self.compare_pgdata(pgdata, pgdata_restored)
13291332

13301333
# START RESTORED NODE
@@ -1402,7 +1405,7 @@ def test_alter_database_set_tablespace_ptrack(self):
14021405

14031406
# GET PHYSICAL CONTENT and COMPARE PHYSICAL CONTENT
14041407
if self.paranoia:
1405-
pgdata_restored = self.pgdata_content(node_restored.data_dir)
1408+
pgdata_restored = self.pgdata_content(node_restored.data_dir, ignore_ptrack=False)
14061409
self.compare_pgdata(pgdata, pgdata_restored)
14071410

14081411
# START RESTORED NODE
@@ -1551,7 +1554,7 @@ def test_ptrack_alter_tablespace(self):
15511554

15521555
# GET PHYSICAL CONTENT FROM RESTORED NODE and COMPARE PHYSICAL CONTENT
15531556
if self.paranoia:
1554-
pgdata_restored = self.pgdata_content(restored_node.data_dir)
1557+
pgdata_restored = self.pgdata_content(restored_node.data_dir, ignore_ptrack=False)
15551558
self.compare_pgdata(pgdata, pgdata_restored)
15561559

15571560
# START RESTORED NODE
@@ -1587,7 +1590,7 @@ def test_ptrack_alter_tablespace(self):
15871590

15881591
# GET PHYSICAL CONTENT FROM RESTORED NODE and COMPARE PHYSICAL CONTENT
15891592
if self.paranoia:
1590-
pgdata_restored = self.pgdata_content(restored_node.data_dir)
1593+
pgdata_restored = self.pgdata_content(restored_node.data_dir, ignore_ptrack=False)
15911594
self.compare_pgdata(pgdata, pgdata_restored)
15921595

15931596
# START RESTORED NODE
@@ -1684,7 +1687,7 @@ def test_ptrack_multiple_segments(self):
16841687

16851688
# GET PHYSICAL CONTENT FROM NODE_RESTORED
16861689
if self.paranoia:
1687-
pgdata_restored = self.pgdata_content(restored_node.data_dir)
1690+
pgdata_restored = self.pgdata_content(restored_node.data_dir, ignore_ptrack=False)
16881691
self.compare_pgdata(pgdata, pgdata_restored)
16891692

16901693
# START RESTORED NODE

0 commit comments

Comments
 (0)