database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix pg_upgrade file share violation on Windows created by the commit

Browse Source 
4741e9afb9.  This was done by adding an
optional second log file parameter to exec_prog(), and closing and
reopening the log file between system() calls.

Backpatch to 9.2.
This commit is contained in:
Bruce Momjian
2012-08-07 13:10:44 -04:00
parent 3a42a3ffd8
commit fbcfa90bb8
6 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/pg_upgrade/server.c
View File

@ -171,11 +171,10 @@ start_postmaster(ClusterInfo *cluster)
* Don't throw an error right away, let connecting throw the error because
* it might supply a reason for the failure.
*/
pg_ctl_return = exec_prog(false, true,
pg_ctl_return = exec_prog(false, true, SERVER_START_LOG_FILE,
/* pass both file names if the differ */
(strcmp(SERVER_LOG_FILE, SERVER_START_LOG_FILE) == 0) ?
SERVER_LOG_FILE :
SERVER_LOG_FILE " or " SERVER_START_LOG_FILE,
(strcmp(SERVER_LOG_FILE, SERVER_START_LOG_FILE) != 0) ?
SERVER_LOG_FILE : NULL,
"%s", cmd);
/* Check to see if we can connect to the server; if not, report it. */
@ -220,7 +219,7 @@ stop_postmaster(bool fast)
cluster->pgopts ? cluster->pgopts : "",
fast ? "-m fast" : "", SERVER_STOP_LOG_FILE);
exec_prog(fast ? false : true, true, SERVER_STOP_LOG_FILE, "%s", cmd);
exec_prog(fast ? false : true, true, SERVER_STOP_LOG_FILE, NULL, "%s", cmd);
os_info.running_cluster = NULL;
}