mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust pg_upgrade to output a separate log file for pg_ctl output on

Browse Source 
Windows, to avoid opening a file by multiple processes.
This commit is contained in:
Bruce Momjian 2012-05-23 20:19:21 -04:00
parent 77f93cb32d
commit 476291bef0
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/pg_upgrade/option.c
View File

@ -57,7 +57,7 @@ parseCommandLine(int argc, char *argv[])
int optindex = 0; /* used by getopt_long */ int optindex = 0; /* used by getopt_long */
int os_user_effective_id; int os_user_effective_id;
FILE *fp; FILE *fp;
int i; char **filename;
time_t run_time = time(NULL); time_t run_time = time(NULL);
user_opts.transfer_mode = TRANSFER_MODE_COPY; user_opts.transfer_mode = TRANSFER_MODE_COPY;
@ -188,11 +188,12 @@ parseCommandLine(int argc, char *argv[])
} }
/* label start of upgrade in logfiles */ /* label start of upgrade in logfiles */
for (i = 0; i < NUM_LOG_FILES; i++) for (filename = output_files; *filename != NULL; filename++)
{ {
if ((fp = fopen_priv(output_files[i], "a")) == NULL) if ((fp = fopen_priv(*filename, "a")) == NULL)
pg_log(PG_FATAL, "cannot write to log file %s\n", pg_log(PG_FATAL, "cannot write to log file %s\n", *filename);
output_files[i]);
/* Start with newline because we might be appending to a file. */
fprintf(fp, "\n" fprintf(fp, "\n"
"-----------------------------------------------------------------\n" "-----------------------------------------------------------------\n"
" pg_upgrade run on %s" " pg_upgrade run on %s"

28
contrib/pg_upgrade/pg_upgrade.c
View File

@ -55,11 +55,16 @@ ClusterInfo old_cluster,
new_cluster; new_cluster;
OSInfo os_info; OSInfo os_info;
char *output_files[NUM_LOG_FILES] = { char *output_files[] = {
SERVER_LOG_FILE, SERVER_LOG_FILE,
#ifdef WIN32
/* file is unique on Win32 */
SERVER_LOG_FILE2,
#endif
RESTORE_LOG_FILE, RESTORE_LOG_FILE,
UTILITY_LOG_FILE, UTILITY_LOG_FILE,
INTERNAL_LOG_FILE INTERNAL_LOG_FILE,
NULL
}; };
@ -454,21 +459,14 @@ cleanup(void)
/* Remove dump and log files? */ /* Remove dump and log files? */
if (!log_opts.retain) if (!log_opts.retain)
{ {
char filename[MAXPGPATH]; char **filename;
int i;
for (i = 0; i < NUM_LOG_FILES; i++) for (filename = output_files; *filename != NULL; filename++)
{ unlink(*filename);
snprintf(filename, sizeof(filename), "%s", output_files[i]);
unlink(filename);
}
/* remove SQL files */ /* remove SQL files */
snprintf(filename, sizeof(filename), "%s", ALL_DUMP_FILE); unlink(ALL_DUMP_FILE);
unlink(filename); unlink(GLOBALS_DUMP_FILE);
snprintf(filename, sizeof(filename), "%s", GLOBALS_DUMP_FILE); unlink(DB_DUMP_FILE);
unlink(filename);
snprintf(filename, sizeof(filename), "%s", DB_DUMP_FILE);
unlink(filename);
} }
} }

9
contrib/pg_upgrade/pg_upgrade.h
View File

@ -40,7 +40,6 @@
#define UTILITY_LOG_FILE "pg_upgrade_utility.log" #define UTILITY_LOG_FILE "pg_upgrade_utility.log"
#define INTERNAL_LOG_FILE "pg_upgrade_internal.log" #define INTERNAL_LOG_FILE "pg_upgrade_internal.log"
#define NUM_LOG_FILES 4
extern char *output_files[]; extern char *output_files[];
/* /*
@ -49,8 +48,10 @@ extern char *output_files[];
* On Win32, we can't send both pg_upgrade output and command output to the * On Win32, we can't send both pg_upgrade output and command output to the
* same file because we get the error: "The process cannot access the file * same file because we get the error: "The process cannot access the file
* because it is being used by another process." so send the pg_ctl * because it is being used by another process." so send the pg_ctl
* command-line output to the utility log file on Windows, rather than * command-line output to a new file, rather than into the server log file.
* into the server log file. * Ideally we could use UTILITY_LOG_FILE for this, but some Windows platforms
* keep the pg_ctl output file open even after pg_ctl exits, perhaps by the
* running postmaster.
* *
* We could use the Windows pgwin32_open() flags to allow shared file * We could use the Windows pgwin32_open() flags to allow shared file
* writes but is unclear how all other tools would use those flags, so * writes but is unclear how all other tools would use those flags, so
@ -60,7 +61,7 @@ extern char *output_files[];
#ifndef WIN32 #ifndef WIN32
#define SERVER_LOG_FILE2 SERVER_LOG_FILE #define SERVER_LOG_FILE2 SERVER_LOG_FILE
#else #else
#define SERVER_LOG_FILE2 UTILITY_LOG_FILE #define SERVER_LOG_FILE2 "pg_upgrade_server2.log"
#endif #endif