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

bmomjian · bmomjian · commit 3825963e7fba · 2012-08-29T17:05:22.000-04:00
reporting in contains invalid data.
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
@@ -766,6 +766,14 @@ CreateLockFile(const char *filename, bool amPostmaster,
 							filename)));
 		close(fd);
 
+		if (len == 0)
+		{
+			ereport(FATAL,
+					(errcode(ERRCODE_LOCK_FILE_EXISTS),
+					 errmsg("lock file \"%s\" is empty", filename),
+					 errhint("Either another server is starting, or the lock file is the remnant of a previous server startup crash.")));
+		}
+
 		buffer[len] = '\0';
 		encoded_pid = atoi(buffer);
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -292,8 +292,13 @@ get_pgpid(void)
 	}
 	if (fscanf(pidf, "%ld", &pid) != 1)
 	{
-		write_stderr(_("%s: invalid data in PID file \"%s\"\n"),
-					 progname, pid_file);
+		/* Is the file empty? */
+		if (ftell(pidf) == 0 && feof(pidf))
+			write_stderr(_("%s: the PID file \"%s\" is empty\n"),
+						 progname, pid_file);
+		else
+			write_stderr(_("%s: invalid data in PID file \"%s\"\n"),
+						 progname, pid_file);
 		exit(1);
 	}
 	fclose(pidf);

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);`