Allow concurrent-safe open() and fopen() in frontend code for Windows

michaelpq · michaelpq · commit f02259fe93e7 · 2018-09-17T20:38:42.000+09:00
PostgreSQL uses a custom wrapper for open() and fopen() which is concurrent-safe, allowing multiple processes to open and work on the same file. This has a couple of advantages: - pg_test_fsync does not handle O_DSYNC correctly otherwise, leading to false claims that disks are unsafe. - TAP tests can run into race conditions when a postmaster and pg_ctl open postmaster.pid, fixing some random failures in the buildfam. pg_upgrade is one frontend tool using workarounds to bypass file locking issues with the log files it generates, however the interactions with pg_ctl are proving to be tedious to get rid of, so this is left for later. Author: Laurenz Albe Reviewed-by: Michael Paquier, Kuntal Ghosh Discussion: https://postgr.es/m/1527846213.2475.31.camel@cybertec.at Discussion: https://postgr.es/m/16922.1520722108@sss.pgh.pa.us
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -490,7 +490,15 @@ readfile(const char *path)
 	char	   *buffer;
 	int			c;
 
+#ifdef WIN32
+	/*
+	 * On Windows, we have to open the file in text mode so that carriage
+	 * returns are stripped.
+	 */
+	if ((infile = fopen(path, "rt")) == NULL)
+#else
 	if ((infile = fopen(path, "r")) == NULL)
+#endif
 	{
 		fprintf(stderr, _("%s: could not open file \"%s\" for reading: %s\n"),
 				progname, path, strerror(errno));
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
@@ -287,7 +287,7 @@ FindStreamingStart(uint32 *tli)
 
 			snprintf(fullpath, sizeof(fullpath), "%s/%s", basedir, dirent->d_name);
 
-			fd = open(fullpath, O_RDONLY | PG_BINARY);
+			fd = open(fullpath, O_RDONLY | PG_BINARY, 0);
 			if (fd < 0)
 			{
 				fprintf(stderr, _("%s: could not open compressed file \"%s\": %s\n"),
diff --git a/src/bin/pg_verify_checksums/pg_verify_checksums.c b/src/bin/pg_verify_checksums/pg_verify_checksums.c
@@ -80,7 +80,7 @@ scan_file(const char *fn, BlockNumber segmentno)
 	int			f;
 	BlockNumber blockno;
 
-	f = open(fn, O_RDONLY | PG_BINARY);
+	f = open(fn, O_RDONLY | PG_BINARY, 0);
 	if (f < 0)
 	{
 		fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
diff --git a/src/common/file_utils.c b/src/common/file_utils.c
@@ -222,7 +222,7 @@ pre_sync_fname(const char *fname, bool isdir, const char *progname)
 {
 	int			fd;
 
-	fd = open(fname, O_RDONLY | PG_BINARY);
+	fd = open(fname, O_RDONLY | PG_BINARY, 0);
 
 	if (fd < 0)
 	{
@@ -283,7 +283,7 @@ fsync_fname(const char *fname, bool isdir, const char *progname)
 	 * unsupported operations, e.g. opening a directory under Windows), and
 	 * logging others.
 	 */
-	fd = open(fname, flags);
+	fd = open(fname, flags, 0);
 	if (fd < 0)
 	{
 		if (errno == EACCES || (isdir && errno == EISDIR))
diff --git a/src/include/port.h b/src/include/port.h
@@ -249,11 +249,8 @@ extern bool rmtree(const char *path, bool rmtopdir);
 #define		O_DIRECT	0x80000000
 extern int	pgwin32_open(const char *, int,...);
 extern FILE *pgwin32_fopen(const char *, const char *);
-
-#ifndef FRONTEND
 #define		open(a,b,c) pgwin32_open(a,b,c)
 #define		fopen(a,b) pgwin32_fopen(a,b)
-#endif
 
 /*
  * Mingw-w64 headers #define popen and pclose to _popen and _pclose.  We want

Original file line number	Diff line number	Diff line change
`@@ -287,7 +287,7 @@ FindStreamingStart(uint32 *tli)`
`287`	`287`
`288`	`288`	`snprintf(fullpath, sizeof(fullpath), "%s/%s", basedir, dirent->d_name);`
`289`	`289`
`290`		`- fd = open(fullpath, O_RDONLY \| PG_BINARY);`
	`290`	`+ fd = open(fullpath, O_RDONLY \| PG_BINARY, 0);`
`291`	`291`	`if (fd < 0)`
`292`	`292`	`{`
`293`	`293`	`fprintf(stderr, _("%s: could not open compressed file \"%s\": %s\n"),`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ scan_file(const char *fn, BlockNumber segmentno)`
`80`	`80`	`int f;`
`81`	`81`	`BlockNumber blockno;`
`82`	`82`
`83`		`- f = open(fn, O_RDONLY \| PG_BINARY);`
	`83`	`+ f = open(fn, O_RDONLY \| PG_BINARY, 0);`
`84`	`84`	`if (f < 0)`
`85`	`85`	`{`
`86`	`86`	`fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ pre_sync_fname(const char fname, bool isdir, const char progname)`
`222`	`222`	`{`
`223`	`223`	`int fd;`
`224`	`224`
`225`		`- fd = open(fname, O_RDONLY \| PG_BINARY);`
	`225`	`+ fd = open(fname, O_RDONLY \| PG_BINARY, 0);`
`226`	`226`
`227`	`227`	`if (fd < 0)`
`228`	`228`	`{`
`@@ -283,7 +283,7 @@ fsync_fname(const char fname, bool isdir, const char progname)`
`283`	`283`	`* unsupported operations, e.g. opening a directory under Windows), and`
`284`	`284`	`* logging others.`
`285`	`285`	`*/`
`286`		`- fd = open(fname, flags);`
	`286`	`+ fd = open(fname, flags, 0);`
`287`	`287`	`if (fd < 0)`
`288`	`288`	`{`
`289`	`289`	`if (errno == EACCES \|\| (isdir && errno == EISDIR))`