From c9de01ace1794801aa189aebff923a68e93af893 Mon Sep 17 00:00:00 2001 From: Amul Sul Date: Thu, 24 Jul 2025 16:37:43 +0530 Subject: [PATCH v6 7/8] pg_verifybackup: Rename the wal-directory switch to wal-path With previous patches to pg_waldump can now decode WAL directly from tar files. This means you'll be able to specify a tar archive path instead of a traditional WAL directory. To keep things consistent and more versatile, we should also generalize the input switch for pg_verifybackup. It should accept either a directory or a tar file path that contains WALs. This change will also aligning it with the existing manifest-path switch naming. --- doc/src/sgml/ref/pg_verifybackup.sgml | 2 +- src/bin/pg_verifybackup/pg_verifybackup.c | 22 +++++++++++----------- src/bin/pg_verifybackup/po/de.po | 4 ++-- src/bin/pg_verifybackup/po/el.po | 4 ++-- src/bin/pg_verifybackup/po/es.po | 4 ++-- src/bin/pg_verifybackup/po/fr.po | 4 ++-- src/bin/pg_verifybackup/po/it.po | 4 ++-- src/bin/pg_verifybackup/po/ja.po | 4 ++-- src/bin/pg_verifybackup/po/ka.po | 4 ++-- src/bin/pg_verifybackup/po/ko.po | 4 ++-- src/bin/pg_verifybackup/po/ru.po | 4 ++-- src/bin/pg_verifybackup/po/sv.po | 4 ++-- src/bin/pg_verifybackup/po/uk.po | 4 ++-- src/bin/pg_verifybackup/po/zh_CN.po | 4 ++-- src/bin/pg_verifybackup/po/zh_TW.po | 4 ++-- src/bin/pg_verifybackup/t/007_wal.pl | 4 ++-- 16 files changed, 40 insertions(+), 40 deletions(-) diff --git a/doc/src/sgml/ref/pg_verifybackup.sgml b/doc/src/sgml/ref/pg_verifybackup.sgml index 61c12975e4a..e9b8bfd51b1 100644 --- a/doc/src/sgml/ref/pg_verifybackup.sgml +++ b/doc/src/sgml/ref/pg_verifybackup.sgml @@ -261,7 +261,7 @@ PostgreSQL documentation - + Try to parse WAL files stored in the specified directory, rather than diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifybackup/pg_verifybackup.c index a502e795b2e..9fcd6be004e 100644 --- a/src/bin/pg_verifybackup/pg_verifybackup.c +++ b/src/bin/pg_verifybackup/pg_verifybackup.c @@ -93,7 +93,7 @@ static void verify_file_checksum(verifier_context *context, uint8 *buffer); static void parse_required_wal(verifier_context *context, char *pg_waldump_path, - char *wal_directory); + char *wal_path); static astreamer *create_archive_verifier(verifier_context *context, char *archive_name, Oid tblspc_oid, @@ -126,7 +126,7 @@ main(int argc, char **argv) {"progress", no_argument, NULL, 'P'}, {"quiet", no_argument, NULL, 'q'}, {"skip-checksums", no_argument, NULL, 's'}, - {"wal-directory", required_argument, NULL, 'w'}, + {"wal-path", required_argument, NULL, 'w'}, {NULL, 0, NULL, 0} }; @@ -135,7 +135,7 @@ main(int argc, char **argv) char *manifest_path = NULL; bool no_parse_wal = false; bool quiet = false; - char *wal_directory = NULL; + char *wal_path = NULL; char *pg_waldump_path = NULL; DIR *dir; @@ -221,8 +221,8 @@ main(int argc, char **argv) context.skip_checksums = true; break; case 'w': - wal_directory = pstrdup(optarg); - canonicalize_path(wal_directory); + wal_path = pstrdup(optarg); + canonicalize_path(wal_path); break; default: /* getopt_long already emitted a complaint */ @@ -365,15 +365,15 @@ main(int argc, char **argv) verify_backup_checksums(&context); /* By default, look for the WAL in the backup directory, too. */ - if (wal_directory == NULL) - wal_directory = psprintf("%s/pg_wal", context.backup_directory); + if (wal_path == NULL) + wal_path = psprintf("%s/pg_wal", context.backup_directory); /* * Try to parse the required ranges of WAL records, unless we were told * not to do so. */ if (!no_parse_wal) - parse_required_wal(&context, pg_waldump_path, wal_directory); + parse_required_wal(&context, pg_waldump_path, wal_path); /* * If everything looks OK, tell the user this, unless we were asked to @@ -1198,7 +1198,7 @@ verify_file_checksum(verifier_context *context, manifest_file *m, */ static void parse_required_wal(verifier_context *context, char *pg_waldump_path, - char *wal_directory) + char *wal_path) { manifest_data *manifest = context->manifest; manifest_wal_range *this_wal_range = manifest->first_wal_range; @@ -1208,7 +1208,7 @@ parse_required_wal(verifier_context *context, char *pg_waldump_path, char *pg_waldump_cmd; pg_waldump_cmd = psprintf("\"%s\" --quiet --path=\"%s\" --timeline=%u --start=%X/%08X --end=%X/%08X\n", - pg_waldump_path, wal_directory, this_wal_range->tli, + pg_waldump_path, wal_path, this_wal_range->tli, LSN_FORMAT_ARGS(this_wal_range->start_lsn), LSN_FORMAT_ARGS(this_wal_range->end_lsn)); fflush(NULL); @@ -1376,7 +1376,7 @@ usage(void) printf(_(" -P, --progress show progress information\n")); printf(_(" -q, --quiet do not print any output, except for errors\n")); printf(_(" -s, --skip-checksums skip checksum verification\n")); - printf(_(" -w, --wal-directory=PATH use specified path for WAL files\n")); + printf(_(" -w, --wal-path=PATH use specified path for WAL files\n")); printf(_(" -V, --version output version information, then exit\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); diff --git a/src/bin/pg_verifybackup/po/de.po b/src/bin/pg_verifybackup/po/de.po index a9e24931100..9b5cd5898cf 100644 --- a/src/bin/pg_verifybackup/po/de.po +++ b/src/bin/pg_verifybackup/po/de.po @@ -785,8 +785,8 @@ msgstr " -s, --skip-checksums Überprüfung der Prüfsummen überspringe #: pg_verifybackup.c:1379 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PFAD angegebenen Pfad für WAL-Dateien verwenden\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PFAD angegebenen Pfad für WAL-Dateien verwenden\n" #: pg_verifybackup.c:1380 #, c-format diff --git a/src/bin/pg_verifybackup/po/el.po b/src/bin/pg_verifybackup/po/el.po index 3e3f20c67c5..81442f51c17 100644 --- a/src/bin/pg_verifybackup/po/el.po +++ b/src/bin/pg_verifybackup/po/el.po @@ -494,8 +494,8 @@ msgstr " -s, --skip-checksums παράκαμψε την επαλήθευ #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH χρησιμοποίησε την καθορισμένη διαδρομή για αρχεία WAL\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH χρησιμοποίησε την καθορισμένη διαδρομή για αρχεία WAL\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/es.po b/src/bin/pg_verifybackup/po/es.po index 0cb958f3448..7f729fa35ba 100644 --- a/src/bin/pg_verifybackup/po/es.po +++ b/src/bin/pg_verifybackup/po/es.po @@ -495,8 +495,8 @@ msgstr " -s, --skip-checksums omitir la verificación de la suma de comp #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH utilizar la ruta especificada para los archivos WAL\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH utilizar la ruta especificada para los archivos WAL\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/fr.po b/src/bin/pg_verifybackup/po/fr.po index da8c72f6427..09937966fa7 100644 --- a/src/bin/pg_verifybackup/po/fr.po +++ b/src/bin/pg_verifybackup/po/fr.po @@ -498,8 +498,8 @@ msgstr " -s, --skip-checksums ignore la vérification des sommes de cont #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=CHEMIN utilise le chemin spécifié pour les fichiers WAL\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=CHEMIN utilise le chemin spécifié pour les fichiers WAL\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/it.po b/src/bin/pg_verifybackup/po/it.po index 317b0b71e7f..4da68d0074e 100644 --- a/src/bin/pg_verifybackup/po/it.po +++ b/src/bin/pg_verifybackup/po/it.po @@ -472,8 +472,8 @@ msgstr " -s, --skip-checksums salta la verifica del checksum\n" #: pg_verifybackup.c:911 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH usa il percorso specificato per i file WAL\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH usa il percorso specificato per i file WAL\n" #: pg_verifybackup.c:912 #, c-format diff --git a/src/bin/pg_verifybackup/po/ja.po b/src/bin/pg_verifybackup/po/ja.po index c910fb236cc..a948959b54f 100644 --- a/src/bin/pg_verifybackup/po/ja.po +++ b/src/bin/pg_verifybackup/po/ja.po @@ -672,8 +672,8 @@ msgstr " -s, --skip-checksums チェックサム検証をスキップ\n" #: pg_verifybackup.c:1379 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH WALファイルに指定したパスを使用する\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH WALファイルに指定したパスを使用する\n" #: pg_verifybackup.c:1380 #, c-format diff --git a/src/bin/pg_verifybackup/po/ka.po b/src/bin/pg_verifybackup/po/ka.po index 982751984c7..ef2799316a8 100644 --- a/src/bin/pg_verifybackup/po/ka.po +++ b/src/bin/pg_verifybackup/po/ka.po @@ -784,8 +784,8 @@ msgstr " -s, --skip-checksums საკონტროლო ჯამ #: pg_verifybackup.c:1379 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=ბილიკი WAL ფაილებისთვის მითითებული ბილიკის გამოყენება\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=ბილიკი WAL ფაილებისთვის მითითებული ბილიკის გამოყენება\n" #: pg_verifybackup.c:1380 #, c-format diff --git a/src/bin/pg_verifybackup/po/ko.po b/src/bin/pg_verifybackup/po/ko.po index acdc3da5e02..eaf91ef1e98 100644 --- a/src/bin/pg_verifybackup/po/ko.po +++ b/src/bin/pg_verifybackup/po/ko.po @@ -501,8 +501,8 @@ msgstr " -s, --skip-checksums 체크섬 검사 건너뜀\n" #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=경로 WAL 파일이 있는 경로 지정\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=경로 WAL 파일이 있는 경로 지정\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/ru.po b/src/bin/pg_verifybackup/po/ru.po index 64005feedfd..7fb0e5ab1f6 100644 --- a/src/bin/pg_verifybackup/po/ru.po +++ b/src/bin/pg_verifybackup/po/ru.po @@ -507,9 +507,9 @@ msgstr " -s, --skip-checksums пропустить проверку ко #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" msgstr "" -" -w, --wal-directory=ПУТЬ использовать заданный путь к файлам WAL\n" +" -w, --wal-path=ПУТЬ использовать заданный путь к файлам WAL\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/sv.po b/src/bin/pg_verifybackup/po/sv.po index 17240feeb5c..97125838e8c 100644 --- a/src/bin/pg_verifybackup/po/sv.po +++ b/src/bin/pg_verifybackup/po/sv.po @@ -492,8 +492,8 @@ msgstr " -s, --skip-checksums hoppa över verifiering av kontrollsummor\ #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=SÖKVÄG använd denna sökväg till WAL-filer\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=SÖKVÄG använd denna sökväg till WAL-filer\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/uk.po b/src/bin/pg_verifybackup/po/uk.po index 034b9764232..63f8041ab38 100644 --- a/src/bin/pg_verifybackup/po/uk.po +++ b/src/bin/pg_verifybackup/po/uk.po @@ -484,8 +484,8 @@ msgstr " -s, --skip-checksums не перевіряти контрольні с #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH використовувати вказаний шлях для файлів WAL\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH використовувати вказаний шлях для файлів WAL\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/po/zh_CN.po b/src/bin/pg_verifybackup/po/zh_CN.po index b7d97c8976d..fb6fcae8b82 100644 --- a/src/bin/pg_verifybackup/po/zh_CN.po +++ b/src/bin/pg_verifybackup/po/zh_CN.po @@ -465,8 +465,8 @@ msgstr " -s, --skip-checksums 跳过校验和验证\n" #: pg_verifybackup.c:919 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH 对WAL文件使用指定路径\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH 对WAL文件使用指定路径\n" #: pg_verifybackup.c:920 #, c-format diff --git a/src/bin/pg_verifybackup/po/zh_TW.po b/src/bin/pg_verifybackup/po/zh_TW.po index c1b710b0a36..568f972b0bb 100644 --- a/src/bin/pg_verifybackup/po/zh_TW.po +++ b/src/bin/pg_verifybackup/po/zh_TW.po @@ -555,8 +555,8 @@ msgstr " -s, --skip-checksums 跳過檢查碼驗證\n" #: pg_verifybackup.c:992 #, c-format -msgid " -w, --wal-directory=PATH use specified path for WAL files\n" -msgstr " -w, --wal-directory=PATH 用指定的路徑存放 WAL 檔\n" +msgid " -w, --wal-path=PATH use specified path for WAL files\n" +msgstr " -w, --wal-path=PATH 用指定的路徑存放 WAL 檔\n" #: pg_verifybackup.c:993 #, c-format diff --git a/src/bin/pg_verifybackup/t/007_wal.pl b/src/bin/pg_verifybackup/t/007_wal.pl index babc4f0a86b..b07f80719b0 100644 --- a/src/bin/pg_verifybackup/t/007_wal.pl +++ b/src/bin/pg_verifybackup/t/007_wal.pl @@ -42,10 +42,10 @@ command_ok([ 'pg_verifybackup', '--no-parse-wal', $backup_path ], command_ok( [ 'pg_verifybackup', - '--wal-directory' => $relocated_pg_wal, + '--wal-path' => $relocated_pg_wal, $backup_path ], - '--wal-directory can be used to specify WAL directory'); + '--wal-path can be used to specify WAL directory'); # Move directory back to original location. rename($relocated_pg_wal, $original_pg_wal) || die "rename pg_wal back: $!"; -- 2.47.1