Skip to content

Commit 600d146

Browse files
gsmolkgsmolk
committed
tests: remove tests for page healing via pg_ptrack_get_block
1 parent b799e6d commit 600d146

File tree

2 files changed

+20
-270
lines changed

2 files changed

+20
-270
lines changed

‎tests/backup.py‎

Lines changed: 20 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,9 @@ def test_incremental_backup_without_full(self):
147147
"without valid full backup.\n Output: {0} \n CMD: {1}".format(
148148
repr(self.output), self.cmd))
149149
except ProbackupException as e:
150-
self.assertIn(
151-
"ERROR: Valid backup on current timeline 1 is not found. "
152-
"Create new FULL backup before an incremental one.",
153-
e.message,
150+
self.assertTrue(
151+
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
152+
"ERROR: Create new full backup before an incremental one" in e.message,
154153
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
155154
repr(e.message), self.cmd))
156155

@@ -165,17 +164,20 @@ def test_incremental_backup_without_full(self):
165164
"without valid full backup.\n Output: {0} \n CMD: {1}".format(
166165
repr(self.output), self.cmd))
167166
except ProbackupException as e:
168-
self.assertIn(
169-
"ERROR: Valid backup on current timeline 1 is not found. "
170-
"Create new FULL backup before an incremental one.",
171-
e.message,
167+
self.assertTrue(
168+
"WARNING: Valid backup on current timeline 1 is not found" in e.message and
169+
"ERROR: Create new full backup before an incremental one" in e.message,
172170
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
173171
repr(e.message), self.cmd))
174172

175173
self.assertEqual(
176174
self.show_pb(backup_dir, 'node')[0]['status'],
177175
"ERROR")
178176

177+
self.assertEqual(
178+
self.show_pb(backup_dir, 'node')[1]['status'],
179+
"ERROR")
180+
179181
# Clean after yourself
180182
self.del_test_dir(module_name, fname)
181183

@@ -315,10 +317,8 @@ def test_ptrack_threads_stream(self):
315317
self.del_test_dir(module_name, fname)
316318

317319
# @unittest.skip("skip")
318-
def test_page_corruption_heal_via_ptrack_1(self):
320+
def test_page_detect_corruption(self):
319321
"""make node, corrupt some page, check that backup failed"""
320-
if not self.ptrack:
321-
return unittest.skip('Skipped because ptrack support is disabled')
322322

323323
fname = self.id().split('.')[3]
324324
node = self.make_simple_node(
@@ -380,98 +380,6 @@ def test_page_corruption_heal_via_ptrack_1(self):
380380
# Clean after yourself
381381
self.del_test_dir(module_name, fname)
382382

383-
# @unittest.skip("skip")
384-
def test_page_corruption_heal_via_ptrack_2(self):
385-
"""make node, corrupt some page, check that backup failed"""
386-
if not self.ptrack:
387-
return unittest.skip('Skipped because ptrack support is disabled')
388-
389-
fname = self.id().split('.')[3]
390-
node = self.make_simple_node(
391-
base_dir=os.path.join(module_name, fname, 'node'),
392-
set_replication=True,
393-
ptrack_enable=True,
394-
initdb_params=['--data-checksums'])
395-
396-
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
397-
398-
self.init_pb(backup_dir)
399-
self.add_instance(backup_dir, 'node', node)
400-
node.slow_start()
401-
402-
if node.major_version >= 12:
403-
node.safe_psql(
404-
"postgres",
405-
"CREATE EXTENSION ptrack WITH SCHEMA pg_catalog")
406-
407-
self.backup_node(
408-
backup_dir, 'node', node, backup_type="full",
409-
options=["-j", "4", "--stream"])
410-
411-
node.safe_psql(
412-
"postgres",
413-
"create table t_heap as select 1 as id, md5(i::text) as text, "
414-
"md5(repeat(i::text,10))::tsvector as tsvector "
415-
"from generate_series(0,1000) i")
416-
node.safe_psql(
417-
"postgres",
418-
"CHECKPOINT;")
419-
420-
heap_path = node.safe_psql(
421-
"postgres",
422-
"select pg_relation_filepath('t_heap')").rstrip()
423-
node.stop()
424-
425-
with open(os.path.join(node.data_dir, heap_path), "rb+", 0) as f:
426-
f.seek(9000)
427-
f.write(b"bla")
428-
f.flush()
429-
f.close
430-
node.slow_start()
431-
432-
try:
433-
self.backup_node(
434-
backup_dir, 'node', node, backup_type="full",
435-
options=["-j", "4", "--stream", '--log-level-console=LOG'])
436-
# we should die here because exception is what we expect to happen
437-
self.assertEqual(
438-
1, 0,
439-
"Expecting Error because of page "
440-
"corruption in PostgreSQL instance.\n"
441-
" Output: {0} \n CMD: {1}".format(
442-
repr(self.output), self.cmd))
443-
except ProbackupException as e:
444-
if self.remote:
445-
self.assertTrue(
446-
"WARNING: File" in e.message and
447-
"try to fetch via shared buffer" in e.message and
448-
"WARNING: page verification failed, "
449-
"calculated checksum" in e.message and
450-
"ERROR: query failed: "
451-
"ERROR: invalid page in block" in e.message and
452-
"query was: SELECT pg_catalog.pg_ptrack_get_block" in e.message,
453-
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
454-
repr(e.message), self.cmd))
455-
else:
456-
self.assertTrue(
457-
"LOG: File" in e.message and
458-
"blknum" in e.message and
459-
"have wrong checksum" in e.message and
460-
"try to fetch via shared buffer" in e.message and
461-
"WARNING: page verification failed, "
462-
"calculated checksum" in e.message and
463-
"ERROR: query failed: "
464-
"ERROR: invalid page in block" in e.message and
465-
"query was: SELECT pg_catalog.pg_ptrack_get_block" in e.message,
466-
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
467-
repr(e.message), self.cmd))
468-
469-
self.assertTrue(
470-
self.show_pb(backup_dir, 'node')[1]['status'] == 'ERROR',
471-
"Backup Status should be ERROR")
472-
473-
# Clean after yourself
474-
self.del_test_dir(module_name, fname)
475383

476384
# @unittest.skip("skip")
477385
def test_backup_detect_corruption(self):
@@ -495,6 +403,10 @@ def test_backup_detect_corruption(self):
495403
"postgres",
496404
"create extension ptrack")
497405

406+
self.backup_node(
407+
backup_dir, 'node', node,
408+
backup_type="full", options=["-j", "4", "--stream"])
409+
498410
node.safe_psql(
499411
"postgres",
500412
"create table t_heap as select 1 as id, md5(i::text) as text, "
@@ -529,10 +441,6 @@ def test_backup_detect_corruption(self):
529441

530442
node.slow_start()
531443

532-
# self.backup_node(
533-
# backup_dir, 'node', node,
534-
# backup_type="full", options=["-j", "4", "--stream"])
535-
536444
try:
537445
self.backup_node(
538446
backup_dir, 'node', node,
@@ -608,12 +516,11 @@ def test_backup_detect_corruption(self):
608516
"\n Output: {0} \n CMD: {1}".format(
609517
repr(self.output), self.cmd))
610518
except ProbackupException as e:
611-
self.assertTrue(
612-
'WARNING: page verification failed, '
613-
'calculated checksum' in e.message and
614-
'ERROR: query failed: ERROR: '
615-
'invalid page in block 1 of relation' in e.message and
616-
'ERROR: Data files transferring failed' in e.message,
519+
self.assertIn(
520+
'ERROR: Corruption detected in file "{0}", block 1: '
521+
'page verification failed, calculated checksum'.format(
522+
heap_fullpath),
523+
e.message,
617524
'\n Unexpected Error Message: {0}\n CMD: {1}'.format(
618525
repr(e.message), self.cmd))
619526

‎tests/delta.py‎

Lines changed: 0 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,163 +1050,6 @@ def test_delta_delete(self):
10501050
# Clean after yourself
10511051
self.del_test_dir(module_name, fname)
10521052

1053-
# @unittest.skip("skip")
1054-
def test_delta_corruption_heal_via_ptrack(self):
1055-
"""make node, corrupt some page, check that backup failed"""
1056-
if not self.ptrack:
1057-
return unittest.skip('Skipped because ptrack support is disabled')
1058-
1059-
fname = self.id().split('.')[3]
1060-
node = self.make_simple_node(
1061-
base_dir=os.path.join(module_name, fname, 'node'),
1062-
set_replication=True,
1063-
initdb_params=['--data-checksums'])
1064-
1065-
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
1066-
1067-
self.init_pb(backup_dir)
1068-
self.add_instance(backup_dir, 'node', node)
1069-
node.slow_start()
1070-
1071-
if node.major_version >= 12:
1072-
node.safe_psql(
1073-
"postgres",
1074-
"CREATE EXTENSION ptrack WITH SCHEMA pg_catalog")
1075-
1076-
self.backup_node(
1077-
backup_dir, 'node', node,
1078-
backup_type="full", options=["-j", "4", "--stream"])
1079-
1080-
node.safe_psql(
1081-
"postgres",
1082-
"create table t_heap as select 1 as id, md5(i::text) as text, "
1083-
"md5(repeat(i::text,10))::tsvector as tsvector "
1084-
"from generate_series(0,1000) i")
1085-
node.safe_psql(
1086-
"postgres",
1087-
"CHECKPOINT;")
1088-
1089-
heap_path = node.safe_psql(
1090-
"postgres",
1091-
"select pg_relation_filepath('t_heap')").rstrip()
1092-
1093-
with open(os.path.join(node.data_dir, heap_path), "rb+", 0) as f:
1094-
f.seek(9000)
1095-
f.write(b"bla")
1096-
f.flush()
1097-
f.close
1098-
1099-
self.backup_node(
1100-
backup_dir, 'node', node,
1101-
backup_type="delta",
1102-
options=["-j", "4", "--stream", '--log-level-file=verbose'])
1103-
1104-
# open log file and check
1105-
with open(os.path.join(backup_dir, 'log', 'pg_probackup.log')) as f:
1106-
log_content = f.read()
1107-
self.assertIn('block 1, try to fetch via shared buffer', log_content)
1108-
self.assertIn('SELECT pg_catalog.pg_ptrack_get_block', log_content)
1109-
f.close
1110-
1111-
self.assertTrue(
1112-
self.show_pb(backup_dir, 'node')[1]['status'] == 'OK',
1113-
"Backup Status should be OK")
1114-
1115-
# Clean after yourself
1116-
self.del_test_dir(module_name, fname)
1117-
1118-
# @unittest.skip("skip")
1119-
def test_page_corruption_heal_via_ptrack(self):
1120-
"""make node, corrupt some page, check that backup failed"""
1121-
if not self.ptrack:
1122-
return unittest.skip('Skipped because ptrack support is disabled')
1123-
1124-
fname = self.id().split('.')[3]
1125-
node = self.make_simple_node(
1126-
base_dir=os.path.join(module_name, fname, 'node'),
1127-
set_replication=True,
1128-
initdb_params=['--data-checksums'])
1129-
1130-
backup_dir = os.path.join(self.tmp_path, module_name, fname, 'backup')
1131-
1132-
self.init_pb(backup_dir)
1133-
self.add_instance(backup_dir, 'node', node)
1134-
node.slow_start()
1135-
1136-
if node.major_version >= 12:
1137-
node.safe_psql(
1138-
"postgres",
1139-
"CREATE EXTENSION ptrack WITH SCHEMA pg_catalog")
1140-
1141-
self.backup_node(
1142-
backup_dir, 'node', node, backup_type="full",
1143-
options=["-j", "4", "--stream"])
1144-
1145-
node.safe_psql(
1146-
"postgres",
1147-
"create table t_heap as select 1 as id, md5(i::text) as text, "
1148-
"md5(repeat(i::text,10))::tsvector as tsvector "
1149-
"from generate_series(0,1000) i")
1150-
node.safe_psql(
1151-
"postgres",
1152-
"CHECKPOINT;")
1153-
1154-
heap_path = node.safe_psql(
1155-
"postgres",
1156-
"select pg_relation_filepath('t_heap')").rstrip()
1157-
node.stop()
1158-
1159-
with open(os.path.join(node.data_dir, heap_path), "rb+", 0) as f:
1160-
f.seek(9000)
1161-
f.write(b"bla")
1162-
f.flush()
1163-
f.close
1164-
node.slow_start()
1165-
1166-
try:
1167-
self.backup_node(
1168-
backup_dir, 'node', node, backup_type="delta",
1169-
options=["-j", "4", "--stream", "--log-level-console=LOG"])
1170-
# we should die here because exception is what we expect to happen
1171-
self.assertEqual(
1172-
1, 0,
1173-
"Expecting Error because of page "
1174-
"corruption in PostgreSQL instance.\n"
1175-
" Output: {0} \n CMD: {1}".format(
1176-
repr(self.output), self.cmd))
1177-
except ProbackupException as e:
1178-
if self.remote:
1179-
self.assertTrue(
1180-
"LOG: File" in e.message and
1181-
"try to fetch via shared buffer" in e.message and
1182-
"WARNING: page verification failed, "
1183-
"calculated checksum" in e.message and
1184-
"ERROR: query failed: "
1185-
"ERROR: invalid page in block" in e.message and
1186-
"query was: SELECT pg_catalog.pg_ptrack_get_block" in e.message,
1187-
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
1188-
repr(e.message), self.cmd))
1189-
else:
1190-
self.assertTrue(
1191-
"WARNING: File" in e.message and
1192-
"blknum" in e.message and
1193-
"have wrong checksum" in e.message and
1194-
"try to fetch via shared buffer" in e.message and
1195-
"WARNING: page verification failed, "
1196-
"calculated checksum" in e.message and
1197-
"ERROR: query failed: "
1198-
"ERROR: invalid page in block" in e.message and
1199-
"query was: SELECT pg_catalog.pg_ptrack_get_block" in e.message,
1200-
"\n Unexpected Error Message: {0}\n CMD: {1}".format(
1201-
repr(e.message), self.cmd))
1202-
1203-
self.assertTrue(
1204-
self.show_pb(backup_dir, 'node')[1]['status'] == 'ERROR',
1205-
"Backup Status should be ERROR")
1206-
1207-
# Clean after yourself
1208-
self.del_test_dir(module_name, fname)
1209-
12101053
def test_delta_nullified_heap_page_backup(self):
12111054
"""
12121055
make node, take full backup, nullify some heap block,

0 commit comments

Comments
 (0)