aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2012-07-03 10:07:47 -0400
committerRobert Haas <rhaas@postgresql.org>2012-07-03 10:07:47 -0400
commit6a77bff086b9bba94ab6cd6229a74f44d3ec266d (patch)
tree3de3c12f2c828a2a7327e559a1ce73dea38707cb /src/backend
parent3cf39e6ddbece4000ee56a0f79cdbe71fb2865ff (diff)
downloadpostgresql-6a77bff086b9bba94ab6cd6229a74f44d3ec266d.tar.gz
postgresql-6a77bff086b9bba94ab6cd6229a74f44d3ec266d.zip
Remove misleading hints about reducing the System V request size.
Since the request size will now be ~48 bytes regardless of how shared_buffers et. al. are set, much of this advice is no longer relevant.
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/port/sysv_shmem.c32
1 files changed, 9 insertions, 23 deletions
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index 98e049380a7..df06312037f 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -167,39 +167,25 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
IPC_CREAT | IPC_EXCL | IPCProtection),
(errno == EINVAL) ?
errhint("This error usually means that PostgreSQL's request for a shared memory "
- "segment exceeded your kernel's SHMMAX parameter. You can either "
- "reduce the request size or reconfigure the kernel with larger SHMMAX. "
- "To reduce the request size (currently %lu bytes), reduce "
- "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers "
- "or max_connections.\n"
- "If the request size is already small, it's possible that it is less than "
- "your kernel's SHMMIN parameter, in which case raising the request size or "
- "reconfiguring SHMMIN is called for.\n"
+ "segment exceeded your kernel's SHMMAX parameter, or possibly that "
+ "it is less than "
+ "your kernel's SHMMIN parameter.\n"
"The PostgreSQL documentation contains more information about shared "
- "memory configuration.",
- (unsigned long) size) : 0,
+ "memory configuration.") : 0,
(errno == ENOMEM) ?
errhint("This error usually means that PostgreSQL's request for a shared "
- "memory segment exceeded available memory or swap space, "
- "or exceeded your kernel's SHMALL parameter. You can either "
- "reduce the request size or reconfigure the kernel with larger SHMALL. "
- "To reduce the request size (currently %lu bytes), reduce "
- "PostgreSQL's shared memory usage, perhaps by reducing shared_buffers "
- "or max_connections.\n"
+ "memory segment exceeded your kernel's SHMALL parameter. You may need "
+ "to reconfigure the kernel with larger SHMALL.\n"
"The PostgreSQL documentation contains more information about shared "
- "memory configuration.",
- (unsigned long) size) : 0,
+ "memory configuration.") : 0,
(errno == ENOSPC) ?
errhint("This error does *not* mean that you have run out of disk space. "
"It occurs either if all available shared memory IDs have been taken, "
"in which case you need to raise the SHMMNI parameter in your kernel, "
"or because the system's overall limit for shared memory has been "
- "reached. If you cannot increase the shared memory limit, "
- "reduce PostgreSQL's shared memory request (currently %lu bytes), "
- "perhaps by reducing shared_buffers or max_connections.\n"
+ "reached.\n"
"The PostgreSQL documentation contains more information about shared "
- "memory configuration.",
- (unsigned long) size) : 0));
+ "memory configuration.") : 0));
}
/* Register on-exit routine to delete the new segment */