Commit 6a77bff0 authored by Robert Haas's avatar Robert Haas

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.
parent 3cf39e6d
...@@ -167,39 +167,25 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size) ...@@ -167,39 +167,25 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, Size size)
IPC_CREAT | IPC_EXCL | IPCProtection), IPC_CREAT | IPC_EXCL | IPCProtection),
(errno == EINVAL) ? (errno == EINVAL) ?
errhint("This error usually means that PostgreSQL's request for a shared memory " errhint("This error usually means that PostgreSQL's request for a shared memory "
"segment exceeded your kernel's SHMMAX parameter. You can either " "segment exceeded your kernel's SHMMAX parameter, or possibly that "
"reduce the request size or reconfigure the kernel with larger SHMMAX. " "it is less than "
"To reduce the request size (currently %lu bytes), reduce " "your kernel's SHMMIN parameter.\n"
"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"
"The PostgreSQL documentation contains more information about shared " "The PostgreSQL documentation contains more information about shared "
"memory configuration.", "memory configuration.") : 0,
(unsigned long) size) : 0,
(errno == ENOMEM) ? (errno == ENOMEM) ?
errhint("This error usually means that PostgreSQL's request for a shared " errhint("This error usually means that PostgreSQL's request for a shared "
"memory segment exceeded available memory or swap space, " "memory segment exceeded your kernel's SHMALL parameter. You may need "
"or exceeded your kernel's SHMALL parameter. You can either " "to reconfigure the kernel with larger SHMALL.\n"
"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"
"The PostgreSQL documentation contains more information about shared " "The PostgreSQL documentation contains more information about shared "
"memory configuration.", "memory configuration.") : 0,
(unsigned long) size) : 0,
(errno == ENOSPC) ? (errno == ENOSPC) ?
errhint("This error does *not* mean that you have run out of disk space. " 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, " "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, " "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 " "or because the system's overall limit for shared memory has been "
"reached. If you cannot increase the shared memory limit, " "reached.\n"
"reduce PostgreSQL's shared memory request (currently %lu bytes), "
"perhaps by reducing shared_buffers or max_connections.\n"
"The PostgreSQL documentation contains more information about shared " "The PostgreSQL documentation contains more information about shared "
"memory configuration.", "memory configuration.") : 0));
(unsigned long) size) : 0));
} }
/* Register on-exit routine to delete the new segment */ /* Register on-exit routine to delete the new segment */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment