Commit3825963

committed

Report postmaster.pid file as empty if it is empty, rather than

reporting in contains invalid data.

1 parentc82dedb commit3825963Copy full SHA for 3825963

File tree

+15

-2

lines changed

+15

-2

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -766,6 +766,14 @@ CreateLockFile(const char *filename, bool amPostmaster,`
`766`	`766`	`filename)));`
`767`	`767`	`close(fd);`
`768`	`768`
	`769`	`+if (len==0)`
	`770`	`+{`
	`771`	`+ereport(FATAL,`
	`772`	`+(errcode(ERRCODE_LOCK_FILE_EXISTS),`
	`773`	`+errmsg("lock file \"%s\" is empty",filename),`
	`774`	`+errhint("Either another server is starting, or the lock file is the remnant of a previous server startup crash.")));`
	`775`	`+}`
	`776`	`+`
`769`	`777`	`buffer[len]='\0';`
`770`	`778`	`encoded_pid=atoi(buffer);`
`771`	`779`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,13 @@ get_pgpid(void)`
`292`	`292`	`}`
`293`	`293`	`if (fscanf(pidf,"%ld",&pid)!=1)`
`294`	`294`	`{`
`295`		`-write_stderr(_("%s: invalid data in PID file \"%s\"\n"),`
`296`		`-progname,pid_file);`
	`295`	`+/* Is the file empty? */`
	`296`	`+if (ftell(pidf)==0&&feof(pidf))`
	`297`	`+write_stderr(_("%s: the PID file \"%s\" is empty\n"),`
	`298`	`+progname,pid_file);`
	`299`	`+else`
	`300`	`+write_stderr(_("%s: invalid data in PID file \"%s\"\n"),`
	`301`	`+progname,pid_file);`
`297`	`302`	`exit(1);`
`298`	`303`	`}`
`299`	`304`	`fclose(pidf);`

Comments

(0)