pg_upgrade: adjust umask() calls

bmomjian · bmomjian · commit 76a7650c40ef · 2013-07-25T11:33:15.000-04:00
Since pg_upgrade -j on Windows uses threads, calling umask()
before/after opening a file via fopen_priv() is no longer possible, so
set umask() as we enter the thread-creating loop, and reset it on exit.
Also adjust internal fopen_priv() calls to just use fopen().
Backpatch to 9.3beta.
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
@@ -17,6 +17,7 @@ void
 generate_old_dump(void)
 {
 	int			dbnum;
+	mode_t		old_umask;
 
 	prep_status("Creating dump of global objects");
 
@@ -31,6 +32,13 @@ generate_old_dump(void)
 
 	prep_status("Creating dump of database schemas\n");
 
+	/*
+	 * Set umask for this function, all functions it calls, and all
+	 * subprocesses/threads it creates.	 We can't use fopen_priv()
+	 * as Windows uses threads and umask is process-global.
+	 */
+	old_umask = umask(S_IRWXG | S_IRWXO);
+
 	/* create per-db dump files */
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
 	{
@@ -54,6 +62,8 @@ generate_old_dump(void)
 	while (reap_child(true) == true)
 		;
 
+	umask(old_umask);
+
 	end_progress_output();
 	check_ok();
 }
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
@@ -47,12 +47,9 @@ exec_prog(const char *log_file, const char *opt_log_file,
 
 #define MAXCMDLEN (2 * MAXPGPATH)
 	char		cmd[MAXCMDLEN];
-	mode_t		old_umask = 0;
 	FILE	   *log;
 	va_list		ap;
 
-	old_umask = umask(S_IRWXG | S_IRWXO);
-
 	written = strlcpy(cmd, SYSTEMQUOTE, sizeof(cmd));
 	va_start(ap, fmt);
 	written += vsnprintf(cmd + written, MAXCMDLEN - written, fmt, ap);
@@ -64,7 +61,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 	if (written >= MAXCMDLEN)
 		pg_log(PG_FATAL, "command too long\n");
 
-	log = fopen_priv(log_file, "a");
+	log = fopen(log_file, "a");
 
 #ifdef WIN32
 	{
@@ -80,7 +77,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 		for (iter = 0; iter < 4 && log == NULL; iter++)
 		{
 			sleep(1);
-			log = fopen_priv(log_file, "a");
+			log = fopen(log_file, "a");
 		}
 	}
 #endif
@@ -101,8 +98,6 @@ exec_prog(const char *log_file, const char *opt_log_file,
 
 	result = system(cmd);
 
-	umask(old_umask);
-
 	if (result != 0)
 	{
 		/* we might be in on a progress status line, so go to the next line */
@@ -131,7 +126,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 	 * never reused while the server is running, so it works fine.	We could
 	 * log these commands to a third file, but that just adds complexity.
 	 */
-	if ((log = fopen_priv(log_file, "a")) == NULL)
+	if ((log = fopen(log_file, "a")) == NULL)
 		pg_log(PG_FATAL, "cannot write to log file %s\n", log_file);
 	fprintf(log, "\n\n");
 	fclose(log);

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ void`
`17`	`17`	`generate_old_dump(void)`
`18`	`18`	`{`
`19`	`19`	`int dbnum;`
	`20`	`+ mode_t old_umask;`
`20`	`21`
`21`	`22`	`prep_status("Creating dump of global objects");`
`22`	`23`
`@@ -31,6 +32,13 @@ generate_old_dump(void)`
`31`	`32`
`32`	`33`	`prep_status("Creating dump of database schemas\n");`
`33`	`34`
	`35`	`+ /*`
	`36`	`+ * Set umask for this function, all functions it calls, and all`
	`37`	`+ * subprocesses/threads it creates. We can't use fopen_priv()`
	`38`	`+ * as Windows uses threads and umask is process-global.`
	`39`	`+ */`
	`40`	`+ old_umask = umask(S_IRWXG \| S_IRWXO);`
	`41`	`+`
`34`	`42`	`/* create per-db dump files */`
`35`	`43`	`for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)`
`36`	`44`	`{`
`@@ -54,6 +62,8 @@ generate_old_dump(void)`
`54`	`62`	`while (reap_child(true) == true)`
`55`	`63`	`;`
`56`	`64`
	`65`	`+ umask(old_umask);`
	`66`	`+`
`57`	`67`	`end_progress_output();`
`58`	`68`	`check_ok();`
`59`	`69`	`}`