Commita11c8be

committed

Back-patch fix to prevent infinite loop when $PGDATA is not writable.

1 parent7d03946 commita11c8beCopy full SHA for a11c8be

File tree

-4

lines changed

-4

lines changed

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.65 2001/04/16 02:42:01 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.65.2.1 2001/08/08 22:25:45 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -490,15 +490,18 @@ CreateLockFile(const char *filename, bool amPostmaster,`
`490`	`490`	`{`
`491`	`491`	`intfd;`
`492`	`492`	`charbuffer[MAXPGPATH+100];`
	`493`	`+intntries;`
`493`	`494`	`intlen;`
`494`	`495`	`intencoded_pid;`
`495`	`496`	`pid_tother_pid;`
`496`	`497`	`pid_tmy_pid=getpid();`
`497`	`498`
`498`	`499`	`/*`
`499`		`- * We need a loop here because of race conditions.`
	`500`	`+ * We need a loop here because of race conditions. But don't loop`
	`501`	`+ * forever (for example, a non-writable $PGDATA directory might cause`
	`502`	`+ * a failure that won't go away). 100 tries seems like plenty.`
`500`	`503`	`*/`
`501`		`-for (;;)`
	`504`	`+for (ntries=0; ;ntries++)`
`502`	`505`	`{`
`503`	`506`
`504`	`507`	`/*`
`@@ -511,7 +514,7 @@ CreateLockFile(const char *filename, bool amPostmaster,`
`511`	`514`	`/*`
`512`	`515`	`* Couldn't create the pid file. Probably it already exists.`
`513`	`516`	`*/`
`514`		`-if (errno!=EEXIST&&errno!=EACCES)`
	`517`	`+if ((errno!=EEXIST&&errno!=EACCES)\|\|ntries>100)`
`515`	`518`	`elog(FATAL,"Can't create lock file %s: %m",filename);`
`516`	`519`
`517`	`520`	`/*`

Comments

(0)