Done the switch for this case. For pg_rewind actually I think that this
is an area where its logic could be improved a bit. So first the data
folder is synced, and then the control file is updated.
Attached is a quick patch about "pg_rewind", so that the control file is
updated after everything else is committed to disk.
--
Fabien.
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 3dcadb9b40..c1e6d7cd07 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -351,9 +351,12 @@ main(int argc, char **argv)
progress_report(true);
- pg_log(PG_PROGRESS, "\ncreating backup label and updating control file\n");
+ pg_log(PG_PROGRESS, "\ncreating backup label\n");
createBackupLabel(chkptredo, chkpttli, chkptrec);
+ pg_log(PG_PROGRESS, "syncing target data directory\n");
+ syncTargetDirectory();
+
/*
* Update control file of target. Make it ready to perform archive
* recovery when restarting.
@@ -362,6 +365,7 @@ main(int argc, char **argv)
* source server. Like in an online backup, it's important that we recover
* all the WAL that was generated while we copied the files over.
*/
+ pg_log(PG_PROGRESS, "updating control file\n");
memcpy(&ControlFile_new, &ControlFile_source, sizeof(ControlFileData));
if (connstr_source)
@@ -377,11 +381,9 @@ main(int argc, char **argv)
ControlFile_new.minRecoveryPoint = endrec;
ControlFile_new.minRecoveryPointTLI = endtli;
ControlFile_new.state = DB_IN_ARCHIVE_RECOVERY;
+
update_controlfile(datadir_target, progname, &ControlFile_new, do_sync);
- pg_log(PG_PROGRESS, "syncing target data directory\n");
- syncTargetDirectory();
-
printf(_("Done!\n"));
return 0;
