Use stat(2) to probe for existing xlog segments in InstallXLogFileSegment,

tglsfdc · tglsfdc · commit 80727ce14fe6 · 2003-01-25T03:06:04.000Z
rather than actually opening the files.  This eliminates some corner cases
where the file indeed exists but open() fails for another reason, such
as being out of file descriptors.  The net reliability gain is probably
tiny, since xlog.c is full of other file open calls that will elog(PANIC)
if they fail for any reason; but this specific failure mode has been
observed in the field, so we may as well fix it.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.110 2002/11/08 20:23:56 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.111 2003/01/25 03:06:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1471,7 +1471,7 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,
 					   bool use_lock)
 {
 	char		path[MAXPGPATH];
-	int			fd;
+	struct stat stat_buf;
 
 	XLogFileName(path, log, seg);
 
@@ -1489,10 +1489,8 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,
 	else
 	{
 		/* Find a free slot to put it in */
-		while ((fd = BasicOpenFile(path, O_RDWR | PG_BINARY,
-								   S_IRUSR | S_IWUSR)) >= 0)
+		while (stat(path, &stat_buf) == 0)
 		{
-			close(fd);
 			if (--max_advance < 0)
 			{
 				/* Failed to find a free slot within specified range */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.110 2002/11/08 20:23:56 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.111 2003/01/25 03:06:04 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1471,7 +1471,7 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,`
`1471`	`1471`	`bool use_lock)`
`1472`	`1472`	`{`
`1473`	`1473`	`char path[MAXPGPATH];`
`1474`		`- int fd;`
	`1474`	`+ struct stat stat_buf;`
`1475`	`1475`
`1476`	`1476`	`XLogFileName(path, log, seg);`
`1477`	`1477`
`@@ -1489,10 +1489,8 @@ InstallXLogFileSegment(uint32 log, uint32 seg, char *tmppath,`
`1489`	`1489`	`else`
`1490`	`1490`	`{`
`1491`	`1491`	`/* Find a free slot to put it in */`
`1492`		`- while ((fd = BasicOpenFile(path, O_RDWR \| PG_BINARY,`
`1493`		`- S_IRUSR \| S_IWUSR)) >= 0)`
	`1492`	`+ while (stat(path, &stat_buf) == 0)`
`1494`	`1493`	`{`
`1495`		`- close(fd);`
`1496`	`1494`	`if (--max_advance < 0)`
`1497`	`1495`	`{`
`1498`	`1496`	`/* Failed to find a free slot within specified range */`