db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-24 08:52:38 +02:00
Code Issues Releases Activity

Merge branch 'master' into release_2_4

Browse Source
This commit is contained in:
Grigory Smolkin 2020-05-31 23:29:24 +03:00
commit fe5d234810
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/data.c
View File

@ -353,17 +353,6 @@ prepare_page(ConnectionArgs *conn_arg,
Assert(false);
}
}
/*
* If ptrack support is available, use it to get invalid block
* instead of rereading it 99 times
*/
if (!page_is_valid && strict && ptrack_version_num > 0)
{
elog(WARNING, "File \"%s\", block %u, try to fetch via shared buffer",
from_fullpath, blknum);
break;
}
}
/*
@ -385,7 +374,7 @@ prepare_page(ConnectionArgs *conn_arg,
/* Error out in case of merge or backup without ptrack support;
* issue warning in case of checkdb or backup with ptrack support
*/
if (!strict || (strict && ptrack_version_num > 0))
if (!strict)
elevel = WARNING;
if (errormsg)
@ -396,16 +385,12 @@ prepare_page(ConnectionArgs *conn_arg,
from_fullpath, blknum);
pg_free(errormsg);
return PageIsCorrupted;
}
/* Checkdb not going futher */
if (!strict)
{
if (page_is_valid)
return PageIsOk;
else
return PageIsCorrupted;
}
return PageIsOk;
}
/*

3
src/parsexlog.c
View File

@ -691,7 +691,8 @@ get_next_record_lsn(const char *archivedir, XLogSegNo segno,
{
XLogReaderState *xlogreader;
XLogReaderData reader_data;
XLogRecPtr startpoint, found, res;
XLogRecPtr startpoint, found;
XLogRecPtr res = InvalidXLogRecPtr;
char wal_segment[MAXFNAMELEN];
int attempts = 0;

7
src/restore.c
View File

@ -100,7 +100,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
{
int i = 0;
int j = 0;
parray *backups;
parray *backups = NULL;
pgBackup *tmp_backup = NULL;
pgBackup *current_backup = NULL;
pgBackup *dest_backup = NULL;
@ -476,13 +476,14 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
/* ssh connection to longer needed */
fio_disconnect();
elog(INFO, "%s of backup %s completed.",
action, base36enc(dest_backup->start_time));
/* cleanup */
parray_walk(backups, pgBackupFree);
parray_free(backups);
parray_free(parent_chain);
elog(INFO, "%s of backup %s completed.",
action, base36enc(dest_backup->start_time));
return 0;
}