db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

Merge branch 'master' into issue_92

Browse Source
This commit is contained in:
Grigory Smolkin
2019-06-28 12:51:47 +03:00
parent c069399f41 79f940ff75
commit ffa63a2e2a
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data.c
+3 -6
View File
@@ -585,7 +585,7 @@ backup_data_file(backup_files_arg* arguments,
}
if (file->size % BLCKSZ != 0)
elog(WARNING, "File: %s, invalid file size %zu", file->path, file->size);
elog(WARNING, "File: \"%s\", invalid file size %zu", file->path, file->size);
/*
* Compute expected number of blocks in the file.
@@ -622,7 +622,7 @@ backup_data_file(backup_files_arg* arguments,
if (rc == PAGE_CHECKSUM_MISMATCH && is_ptrack_support)
goto RetryUsingPtrack;
if (rc < 0)
elog(ERROR, "Failed to read file %s: %s",
elog(ERROR, "Failed to read file \"%s\": %s",
file->path, rc == PAGE_CHECKSUM_MISMATCH ? "data file checksum mismatch" : strerror(-rc));
n_blocks_read = rc;
}
@@ -1209,10 +1209,7 @@ check_data_file(ConnectionArgs *arguments,
}
if (file->size % BLCKSZ != 0)
{
fclose(in);
elog(WARNING, "File: %s, invalid file size %zu", file->path, file->size);
}
elog(WARNING, "File: \"%s\", invalid file size %zu", file->path, file->size);
/*
* Compute expected number of blocks in the file.
src/utils/file.c
+1 -2
View File
@@ -1150,8 +1150,7 @@ int fio_send_pages(FILE* in, FILE* out, pgFile *file,
if ((int)hdr.arg < 0) /* read error */
{
errno = -(int)hdr.arg;
return -1;
return (int)hdr.arg;
}
blknum = hdr.arg;