db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-12-01 09:51:43 +02:00
Code Issues Releases Activity

don't handle possible hole cut at restore

Browse Source
This commit is contained in:
Anastasia 2017-02-13 17:34:29 +03:00
parent cd6dd02245
commit a39511bf88
1 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
data.c
View File

@ -22,13 +22,10 @@
typedef struct BackupPageHeader typedef struct BackupPageHeader
{ {
BlockNumber block; /* block number */ BlockNumber block; /* block number */
uint16 hole_offset; /* number of bytes before "hole" */
uint16 hole_length; /* number of bytes in "hole" */
} BackupPageHeader; } BackupPageHeader;
static bool static bool
parse_page(const DataPage *page, parse_page(const DataPage *page, XLogRecPtr *lsn)
XLogRecPtr *lsn, uint16 *offset, uint16 *length)
{ {
const PageHeaderData *page_data = &page->page_data; const PageHeaderData *page_data = &page->page_data;
@ -43,13 +40,8 @@ parse_page(const DataPage *page,
page_data->pd_upper <= page_data->pd_special && page_data->pd_upper <= page_data->pd_special &&
page_data->pd_special <= BLCKSZ && page_data->pd_special <= BLCKSZ &&
page_data->pd_special == MAXALIGN(page_data->pd_special)) page_data->pd_special == MAXALIGN(page_data->pd_special))
{
*offset = page_data->pd_lower;
*length = page_data->pd_upper - page_data->pd_lower;
return true; return true;
}
*offset = *length = 0;
return false; return false;
} }
@ -87,8 +79,7 @@ backup_data_page(pgFile *file, const XLogRecPtr *lsn,
* If an invalid data page was found, fallback to simple copy to ensure * If an invalid data page was found, fallback to simple copy to ensure
* all pages in the file don't have BackupPageHeader. * all pages in the file don't have BackupPageHeader.
*/ */
if (!parse_page(&page, &page_lsn, if (!parse_page(&page, &page_lsn))
&header.hole_offset, &header.hole_length))
{ {
int i; int i;
/* Check if the page is zeroed. */ /* Check if the page is zeroed. */
@ -467,49 +458,38 @@ restore_data_file(const char *from_root,
if (read_len == 0 && feof(in)) if (read_len == 0 && feof(in))
break; /* EOF found */ break; /* EOF found */
else if (read_len != 0 && feof(in)) else if (read_len != 0 && feof(in))
{
elog(ERROR, elog(ERROR,
"odd size page found at block %u of \"%s\"", "odd size page found at block %u of \"%s\"",
blknum, file->path); blknum, file->path);
}
else else
{
elog(ERROR, "cannot read block %u of \"%s\": %s", elog(ERROR, "cannot read block %u of \"%s\": %s",
blknum, file->path, strerror(errno_tmp)); blknum, file->path, strerror(errno_tmp));
} }
}
if (header.block < blknum || header.hole_offset > BLCKSZ || if (header.block < blknum)
(int) header.hole_offset + (int) header.hole_length > BLCKSZ)
{
elog(ERROR, "backup is broken at block %u", elog(ERROR, "backup is broken at block %u",
blknum); blknum);
}
upper_offset = header.hole_offset + header.hole_length;
upper_length = BLCKSZ - upper_offset;
/* read lower/upper into page.data and restore hole */ if (fread(page.data, 1, BLCKSZ, in) != BLCKSZ)
memset(page.data + header.hole_offset, 0, header.hole_length);
if (fread(page.data, 1, header.hole_offset, in) != header.hole_offset ||
fread(page.data + upper_offset, 1, upper_length, in) != upper_length)
{
elog(ERROR, "cannot read block %u of \"%s\": %s", elog(ERROR, "cannot read block %u of \"%s\": %s",
blknum, file->path, strerror(errno)); blknum, file->path, strerror(errno));
}
/* update checksum because we are not save whole */ /* update checksum because we are not save whole */
if(backup->checksum_version) if(backup->checksum_version)
{ {
/* skip calc checksum if zero page */ bool is_zero_page = false;
if(page.page_data.pd_upper == 0) if(page.page_data.pd_upper == 0)
{ {
int i; int i;
for(i=0; i<BLCKSZ && page.data[i] == 0; i++); for(i = 0; i < BLCKSZ && page.data[i] == 0; i++);
if (i == BLCKSZ) if (i == BLCKSZ)
goto skip_checksum; is_zero_page = true;
} }
/* skip calc checksum if zero page */
if (!is_zero_page)
((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, file->segno * RELSEG_SIZE + header.block); ((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, file->segno * RELSEG_SIZE + header.block);
} }