database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-08 07:21:33 +03:00
Code

File size in a backup manifest should use uint64, not size_t.

Browse Source 
size_t is the size of an object in memory, not the size of a file on disk.

Thanks to Tom Lane for noting the error.

Discussion: http://postgr.es/m/1865585.1727803933@sss.pgh.pa.us
This commit is contained in:
Robert Haas 2024-10-02 09:59:04 -04:00
parent 7b2822ecf9
commit d94cf5ca7f
9 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_combinebackup/load_manifest.c
View File

@ -60,7 +60,7 @@ static void combinebackup_version_cb(JsonManifestParseContext *context,
static void combinebackup_system_identifier_cb(JsonManifestParseContext *context,
uint64 manifest_system_identifier);
static void combinebackup_per_file_cb(JsonManifestParseContext *context,
const char *pathname, size_t size,
const char *pathname, uint64 size,
pg_checksum_type checksum_type,
int checksum_length,
uint8 *checksum_payload);
@ -267,7 +267,7 @@ combinebackup_system_identifier_cb(JsonManifestParseContext *context,
*/
static void
combinebackup_per_file_cb(JsonManifestParseContext *context,
const char *pathname, size_t size,
const char *pathname, uint64 size,
pg_checksum_type checksum_type,
int checksum_length, uint8 *checksum_payload)
{

2
src/bin/pg_combinebackup/load_manifest.h
View File

@ -23,7 +23,7 @@ typedef struct manifest_file
{
uint32 status; /* hash status */
const char *pathname;
size_t size;
uint64 size;
pg_checksum_type checksum_type;
int checksum_length;
uint8 *checksum_payload;

5
src/bin/pg_combinebackup/write_manifest.c
View File

@ -74,7 +74,7 @@ create_manifest_writer(char *directory, uint64 system_identifier)
*/
void
add_file_to_manifest(manifest_writer *mwriter, const char *manifest_path,
size_t size, time_t mtime,
uint64 size, time_t mtime,
pg_checksum_type checksum_type,
int checksum_length,
uint8 *checksum_payload)
@ -104,7 +104,8 @@ add_file_to_manifest(manifest_writer *mwriter, const char *manifest_path,
appendStringInfoString(&mwriter->buf, "\", ");
}
appendStringInfo(&mwriter->buf, "\"Size\": %zu, ", size);
appendStringInfo(&mwriter->buf, "\"Size\": %llu, ",
(unsigned long long) size);
appendStringInfoString(&mwriter->buf, "\"Last-Modified\": \"");
enlargeStringInfo(&mwriter->buf, 128);

2
src/bin/pg_combinebackup/write_manifest.h
View File

@ -23,7 +23,7 @@ extern manifest_writer *create_manifest_writer(char *directory,
uint64 system_identifier);
extern void add_file_to_manifest(manifest_writer *mwriter,
const char *manifest_path,
size_t size, time_t mtime,
uint64 size, time_t mtime,
pg_checksum_type checksum_type,
int checksum_length,
uint8 *checksum_payload);

13
src/bin/pg_verifybackup/astreamer_verify.c
View File

@ -207,9 +207,11 @@ member_verify_header(astreamer *streamer, astreamer_member *member)
if (m->size != member->size)
{
report_backup_error(mystreamer->context,
"\"%s\" has size %lld in \"%s\" but size %zu in the manifest",
member->pathname, (long long int) member->size,
mystreamer->archive_name, m->size);
"\"%s\" has size %llu in \"%s\" but size %llu in the manifest",
member->pathname,
(unsigned long long) member->size,
mystreamer->archive_name,
(unsigned long long) m->size);
m->bad = true;
return;
}
@ -294,9 +296,10 @@ member_verify_checksum(astreamer *streamer)
if (mystreamer->checksum_bytes != m->size)
{
report_backup_error(mystreamer->context,
"file \"%s\" in \"%s\" should contain %zu bytes, but read %zu bytes",
"file \"%s\" in \"%s\" should contain %llu bytes, but read %llu bytes",
m->pathname, mystreamer->archive_name,
m->size, mystreamer->checksum_bytes);
(unsigned long long) m->size,
(unsigned long long) mystreamer->checksum_bytes);
return;
}

16
src/bin/pg_verifybackup/pg_verifybackup.c
View File

@ -61,7 +61,7 @@ static void verifybackup_version_cb(JsonManifestParseContext *context,
static void verifybackup_system_identifier(JsonManifestParseContext *context,
uint64 manifest_system_identifier);
static void verifybackup_per_file_cb(JsonManifestParseContext *context,
const char *pathname, size_t size,
const char *pathname, uint64 size,
pg_checksum_type checksum_type,
int checksum_length,
uint8 *checksum_payload);
@ -547,7 +547,7 @@ verifybackup_system_identifier(JsonManifestParseContext *context,
*/
static void
verifybackup_per_file_cb(JsonManifestParseContext *context,
const char *pathname, size_t size,
const char *pathname, uint64 size,
pg_checksum_type checksum_type,
int checksum_length, uint8 *checksum_payload)
{
@ -719,8 +719,9 @@ verify_plain_backup_file(verifier_context *context, char *relpath,
if (m->size != sb.st_size)
{
report_backup_error(context,
"\"%s\" has size %lld on disk but size %zu in the manifest",
relpath, (long long int) sb.st_size, m->size);
"\"%s\" has size %llu on disk but size %llu in the manifest",
relpath, (unsigned long long) sb.st_size,
(unsigned long long) m->size);
m->bad = true;
}
@ -1101,7 +1102,7 @@ verify_file_checksum(verifier_context *context, manifest_file *m,
const char *relpath = m->pathname;
int fd;
int rc;
size_t bytes_read = 0;
uint64 bytes_read = 0;
uint8 checksumbuf[PG_CHECKSUM_MAX_LENGTH];
int checksumlen;
@ -1164,8 +1165,9 @@ verify_file_checksum(verifier_context *context, manifest_file *m,
if (bytes_read != m->size)
{
report_backup_error(context,
"file \"%s\" should contain %zu bytes, but read %zu bytes",
relpath, m->size, bytes_read);
"file \"%s\" should contain %llu bytes, but read %llu bytes",
relpath, (unsigned long long) m->size,
(unsigned long long) bytes_read);
return;
}

2
src/bin/pg_verifybackup/pg_verifybackup.h
View File

@ -29,7 +29,7 @@ typedef struct manifest_file
{
uint32 status; /* hash status */
const char *pathname;
size_t size;
uint64 size;
pg_checksum_type checksum_type;
int checksum_length;
uint8 *checksum_payload;

4
src/common/parse_manifest.c
View File

@ -650,7 +650,7 @@ static void
json_manifest_finalize_file(JsonManifestParseState *parse)
{
JsonManifestParseContext *context = parse->context;
size_t size;
uint64 size;
char *ep;
int checksum_string_length;
pg_checksum_type checksum_type;
@ -688,7 +688,7 @@ json_manifest_finalize_file(JsonManifestParseState *parse)
}
/* Parse size. */
size = strtoul(parse->size, &ep, 10);
size = strtou64(parse->size, &ep, 10);
if (*ep)
json_manifest_parse_failure(parse->context,
"file size is not an integer");

2
src/include/common/parse_manifest.h
View File

@ -28,7 +28,7 @@ typedef void (*json_manifest_system_identifier_callback) (JsonManifestParseConte
uint64 manifest_system_identifier);
typedef void (*json_manifest_per_file_callback) (JsonManifestParseContext *,
const char *pathname,
size_t size, pg_checksum_type checksum_type,
uint64 size, pg_checksum_type checksum_type,
int checksum_length, uint8 *checksum_payload);
typedef void (*json_manifest_per_wal_range_callback) (JsonManifestParseContext *,
TimeLineID tli,