database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

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

Browse Source 
reporting in contains invalid data.
This commit is contained in:
Bruce Momjian
2012-08-29 17:05:22 -04:00
parent c82dedb7a8
commit 3825963e7f
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/init/miscinit.c
View File

@ -766,6 +766,14 @@ CreateLockFile(const char *filename, bool amPostmaster,
filename))); filename)));
close(fd); 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'; buffer[len] = '\0';
encoded_pid = atoi(buffer); encoded_pid = atoi(buffer);

9
src/bin/pg_ctl/pg_ctl.c
View File

@ -292,8 +292,13 @@ get_pgpid(void)
} }
if (fscanf(pidf, "%ld", &pid) != 1) if (fscanf(pidf, "%ld", &pid) != 1)
{ {
write_stderr(_("%s: invalid data in PID file \"%s\"\n"), /* Is the file empty? */
progname, pid_file); 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); exit(1);
} }
fclose(pidf); fclose(pidf);