From: Michael Paquier Date: Fri, 4 Oct 2019 00:16:03 +0000 (+0900) Subject: Fix --dry-run mode of pg_rewind X-Git-Tag: REL_12_1~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2e3b311d9ef85e99b04944e7e6f98e3a336de84;p=thirdparty%2Fpostgresql.git Fix --dry-run mode of pg_rewind Even if --dry-run mode was specified, the control file was getting updated, preventing follow-up runs of pg_rewind to work properly on the target data folder. The origin of the problem came from the refactoring done by ce6afc6. Author: Alexey Kondratov Discussion: https://postgr.es/m/7ca88204-3e0b-2f4c-c8af-acadc4b266e5@postgrespro.ru Backpatch-through: 12 --- diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c index d378053de45..f9d94764ad6 100644 --- a/src/bin/pg_rewind/pg_rewind.c +++ b/src/bin/pg_rewind/pg_rewind.c @@ -388,7 +388,8 @@ main(int argc, char **argv) ControlFile_new.minRecoveryPoint = endrec; ControlFile_new.minRecoveryPointTLI = endtli; ControlFile_new.state = DB_IN_ARCHIVE_RECOVERY; - update_controlfile(datadir_target, &ControlFile_new, do_sync); + if (!dry_run) + update_controlfile(datadir_target, &ControlFile_new, do_sync); if (showprogress) pg_log_info("syncing target data directory");