db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-24 11:46:31 +02:00
Code Issues Releases Activity

[Issue #326] some minor fixes

Browse Source
This commit is contained in:
Grigory Smolkin 2021-02-15 16:19:55 +03:00
parent 74cd9c54df
commit 4ab117bd3c
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/restore.c
View File

@ -290,7 +290,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
timelines = read_timeline_history(arclog_path, rt->target_tli, true); timelines = read_timeline_history(arclog_path, rt->target_tli, true);
if (!timelines) if (!timelines)
elog(WARNING, "Failed to get history file for target timeline %i", rt->target_tli); elog(ERROR, "Failed to get history file for target timeline %i", rt->target_tli);
if (!satisfy_timeline(timelines, current_backup)) if (!satisfy_timeline(timelines, current_backup))
{ {
@ -1782,7 +1782,7 @@ read_timeline_history(const char *arclog_path, TimeLineID targetTLI, bool strict
elog(ERROR, "Timeline IDs must be less than child timeline's ID."); elog(ERROR, "Timeline IDs must be less than child timeline's ID.");
/* History file is empty or corrupted */ /* History file is empty or corrupted */
if (parray_num(result) != 1) if (parray_num(result) == 0)
{ {
elog(WARNING, "History file is corrupted: \"%s\"", path); elog(WARNING, "History file is corrupted: \"%s\"", path);
pg_free(result); pg_free(result);

40
tests/archive.py
View File

@ -2485,23 +2485,13 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
node = self.make_simple_node( node = self.make_simple_node(
base_dir=os.path.join(module_name, fname, 'node'), base_dir=os.path.join(module_name, fname, 'node'),
set_replication=True, set_replication=True,
initdb_params=['--data-checksums'], initdb_params=['--data-checksums'])
pg_options={
'archive_timeout': '30s',
'checkpoint_timeout': '30s',
'autovacuum': 'off'})
if self.get_version(node) < self.version_to_num('9.6.0'):
self.del_test_dir(module_name, fname)
return unittest.skip(
'Skipped because backup from replica is not supported in PG 9.5')
self.init_pb(backup_dir) self.init_pb(backup_dir)
self.add_instance(backup_dir, 'node', node) self.add_instance(backup_dir, 'node', node)
self.set_archiving(backup_dir, 'node', node) self.set_archiving(backup_dir, 'node', node)
node.slow_start() node.slow_start()
node.pgbench_init(scale=5) node.pgbench_init(scale=5)
# FULL # FULL
@ -2516,7 +2506,6 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
'--recovery-target=latest', '--recovery-target=latest',
'--recovery-target-action=promote']) '--recovery-target-action=promote'])
# '--recovery-target-timeline=2',
# Node in timeline 2 # Node in timeline 2
node.slow_start() node.slow_start()
@ -2545,22 +2534,35 @@ class ArchiveTest(ProbackupTest, unittest.TestCase):
# Node in timeline 4 # Node in timeline 4
node.slow_start() node.slow_start()
node.pgbench_init(scale=1) node.pgbench_init(scale=5)
# Truncate history files # Truncate history files
for tli in range(2, 4): for tli in range(2, 5):
file = os.path.join( file = os.path.join(
backup_dir, 'wal', 'node', '0000000{0}.history'.format(tli)) backup_dir, 'wal', 'node', '0000000{0}.history'.format(tli))
with open(file, "w+") as f: with open(file, "w+") as f:
f.truncate() f.truncate()
show = self.show_archive(backup_dir, 'node') timelines = self.show_archive(backup_dir, 'node', options=['--log-level-file=INFO'])
timelines = show['timelines'] # check that all timelines has zero switchpoint
for timeline in timelines:
self.assertEqual(timeline['switchpoint'], '0/0')
# check that all timelines are ok log_file = os.path.join(backup_dir, 'log', 'pg_probackup.log')
for timeline in replica_timelines: with open(log_file, 'r') as f:
print(timeline) log_content = f.read()
wal_dir = os.path.join(backup_dir, 'wal', 'node')
self.assertIn(
'WARNING: History file is corrupted: "{0}"'.format(os.path.join(wal_dir, '00000002.history')),
log_content)
self.assertIn(
'WARNING: History file is corrupted: "{0}"'.format(os.path.join(wal_dir, '00000003.history')),
log_content)
self.assertIn(
'WARNING: History file is corrupted: "{0}"'.format(os.path.join(wal_dir, '00000004.history')),
log_content)
self.del_test_dir(module_name, fname) self.del_test_dir(module_name, fname)