mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-06 15:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix code to properly pull out shared memory key now that the

Browse Source 
postmaster.pid file is larger than in previous major versions.
This is a bug introduced when I added lines to the file recently.
This commit is contained in:
Bruce Momjian 2010-12-27 23:11:33 -05:00
parent c0577c92a8
commit bada44a2a2
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,29 +825,34 @@ CreateLockFile(const char *filename, bool amPostmaster,
*/
if (isDDLock)
{
char *ptr;
char *ptr = NULL;
unsigned long id1,
id2;
int lineno;
ptr = strchr(buffer, '\n');
if (ptr != NULL &&
(ptr = strchr(ptr + 1, '\n')) != NULL)
for (lineno = 1; lineno <= 4; lineno++)
{
ptr++;
if (sscanf(ptr, "%lu %lu", &id1, &id2) == 2)
if ((ptr = strchr(ptr, '\n')) == NULL)
{
if (PGSharedMemoryIsInUse(id1, id2))
ereport(FATAL,
(errcode(ERRCODE_LOCK_FILE_EXISTS),
errmsg("pre-existing shared memory block "
"(key %lu, ID %lu) is still in use",
id1, id2),
errhint("If you're sure there are no old "
"server processes still running, remove "
"the shared memory block "
"or just delete the file \"%s\".",
filename)));
elog(LOG, "bogus data in \"%s\"", DIRECTORY_LOCK_FILE);
break;
}
ptr++;
}
if (ptr && sscanf(ptr, "%lu %lu", &id1, &id2) == 2)
{
if (PGSharedMemoryIsInUse(id1, id2))
ereport(FATAL,
(errcode(ERRCODE_LOCK_FILE_EXISTS),
errmsg("pre-existing shared memory block "
"(key %lu, ID %lu) is still in use",
id1, id2),
errhint("If you're sure there are no old "
"server processes still running, remove "
"the shared memory block "
"or just delete the file \"%s\".",
filename)));
}
}