Fix bug in pg_basebackup -F plain -R.

MasaoFujii · MasaoFujii · commit be6221e9be23 · 2020-02-12T09:08:22.000+09:00
Commit caba97a changed pg_basebackup -F plain -R so that it overwrote postgresql.auto.conf in the backup, with new connection setting. This could cause the existing postgresql.auto.conf settings in the server to get lost unexpectedly. This is a bug. This commit fixes the bug by making pg_basebackup -F plain -R append the connection setting into postgresql.auto.conf in the backup. Author: Fujii Masao Reviewed-by: Sergei Kornilov Discussion: https://postgr.es/m/250dcf2a-94e7-c05e-824a-73cfb38a48a4@oss.nttdata.com
diff --git a/src/fe_utils/recovery_gen.c b/src/fe_utils/recovery_gen.c
@@ -128,7 +128,7 @@ WriteRecoveryConfig(PGconn *pgconn, char *target_dir, PQExpBuffer contents)
 	snprintf(filename, MAXPGPATH, "%s/%s", target_dir,
 			 use_recovery_conf ? "recovery.conf" : "postgresql.auto.conf");
 
-	cf = fopen(filename, use_recovery_conf ? "a" : "w");
+	cf = fopen(filename, use_recovery_conf ? "w" : "a");
 	if (cf == NULL)
 	{
 		pg_log_error("could not open file \"%s\": %m", filename);

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ WriteRecoveryConfig(PGconn pgconn, char target_dir, PQExpBuffer contents)`
`128`	`128`	`snprintf(filename, MAXPGPATH, "%s/%s", target_dir,`
`129`	`129`	`use_recovery_conf ? "recovery.conf" : "postgresql.auto.conf");`
`130`	`130`
`131`		`- cf = fopen(filename, use_recovery_conf ? "a" : "w");`
	`131`	`+ cf = fopen(filename, use_recovery_conf ? "w" : "a");`
`132`	`132`	`if (cf == NULL)`
`133`	`133`	`{`
`134`	`134`	`pg_log_error("could not open file \"%s\": %m", filename);`