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

pg_verifybackup: Move skip_checksums into verifier_context.

Browse Source 
This is in preparation for adding a second source file to this
directory. It will need access to this value. Also, fewer global
variables is usually a good thing.

Amul Sul, reviewed by Sravan Kumar and revised a bit by me.

Discussion: http://postgr.es/m/CAAJ_b95mcGjkfAf1qduOR97CokW8-_i-dWLm3v6x1w2-OW9M+A@mail.gmail.com
This commit is contained in:
Robert Haas 2024-08-16 14:52:52 -04:00
parent 76dd015e85
commit af99d44a88
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,7 @@ typedef struct verifier_context
manifest_data *manifest; manifest_data *manifest;
char *backup_directory; char *backup_directory;
SimpleStringList ignore_list; SimpleStringList ignore_list;
bool skip_checksums;
bool exit_on_error; bool exit_on_error;
bool saw_any_error; bool saw_any_error;
} verifier_context; } verifier_context;
@ -162,9 +163,8 @@ static void usage(void);
static const char *progname; static const char *progname;
/* options */ /* is progress reporting enabled? */
static bool show_progress = false; static bool show_progress = false;
static bool skip_checksums = false;
/* Progress indicators */ /* Progress indicators */
static uint64 total_size = 0; static uint64 total_size = 0;
@ -266,7 +266,7 @@ main(int argc, char **argv)
quiet = true; quiet = true;
break; break;
case 's': case 's':
skip_checksums = true; context.skip_checksums = true;
break; break;
case 'w': case 'w':
wal_directory = pstrdup(optarg); wal_directory = pstrdup(optarg);
@ -363,7 +363,7 @@ main(int argc, char **argv)
* Now do the expensive work of verifying file checksums, unless we were * Now do the expensive work of verifying file checksums, unless we were
* told to skip it. * told to skip it.
*/ */
if (!skip_checksums) if (!context.skip_checksums)
verify_backup_checksums(&context); verify_backup_checksums(&context);
/* /*
@ -739,7 +739,8 @@ verify_backup_file(verifier_context *context, char *relpath, char *fullpath)
verify_control_file(fullpath, context->manifest->system_identifier); verify_control_file(fullpath, context->manifest->system_identifier);
/* Update statistics for progress report, if necessary */ /* Update statistics for progress report, if necessary */
if (show_progress && !skip_checksums && should_verify_checksum(m)) if (show_progress && !context->skip_checksums &&
should_verify_checksum(m))
total_size += m->size; total_size += m->size;
/* /*