summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2019-04-01 02:32:48 +0000
committerNoah Misch2019-04-01 02:32:48 +0000
commit5a907404b52753c4d6c6a7c21765aeaa42fd6a3b (patch)
treedc9902315422bb2680a054178781327779af154b
parentbfbcad478f05794e5e7ea1339e62a1d258c99b6c (diff)
Update HINT for pre-existing shared memory block.
One should almost always terminate an old process, not use a manual removal tool like ipcrm. Removal of the ipcclean script eleven years ago (39627b1ae680cba44f6e56ca5facec4fdbfe9495) and its non-replacement corroborate that manual shm removal is now a niche goal. Back-patch to 9.4 (all supported versions). Reviewed by Daniel Gustafsson and Kyotaro HORIGUCHI. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/backend/utils/init/miscinit.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index bd2e4e89d8..c180a9910d 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -1066,14 +1066,10 @@ CreateLockFile(const char *filename, bool amPostmaster,
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",
+ 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)));
+ errhint("Terminate any old server processes associated with data directory \"%s\".",
+ refName)));
}
}