diff options
| -rw-r--r-- | doc/src/sgml/config.sgml | 5 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 12 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 14 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 5 |
4 files changed, 9 insertions, 27 deletions
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 2e8d62e2923..677fd4d7bf5 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.167 2008/03/05 16:59:10 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.168 2008/03/09 04:56:28 tgl Exp $ --> <chapter Id="runtime-config"> <title>Server Configuration</title> @@ -736,8 +736,7 @@ SET ENABLE_SEQSCAN TO OFF; memory buffers. The default is typically 32 megabytes (<literal>32MB</>), but might be less if your kernel settings will not support it (as determined during <application>initdb</>). - This setting must be at least 128 kilobytes and at least 16 - kilobytes times <xref linkend="guc-max-connections">. (Non-default + This setting must be at least 128 kilobytes. (Non-default values of <symbol>BLCKSZ</symbol> change the minimum.) However, settings significantly higher than the minimum are usually needed for good performance. Several tens of megabytes are recommended diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 2c481f93bbf..7a83e075b18 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.552 2008/02/20 22:46:24 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.553 2008/03/09 04:56:28 tgl Exp $ * * NOTES * @@ -688,16 +688,6 @@ PostmasterMain(int argc, char *argv[]) /* * Check for invalid combinations of GUC settings. */ - if (NBuffers < 2 * MaxBackends || NBuffers < 16) - { - /* - * Do not accept -B so small that backends are likely to starve for - * lack of buffers. The specific choices here are somewhat arbitrary. - */ - write_stderr("%s: the number of buffers (-B) must be at least twice the number of allowed connections (-N) and at least 16\n", progname); - ExitPostmaster(1); - } - if (ReservedBackends >= MaxBackends) { write_stderr("%s: superuser_reserved_connections must be less than max_connections\n", progname); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 9b33547ed47..1acf2bc0622 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.433 2008/03/06 16:31:42 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.434 2008/03/09 04:56:28 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -1195,16 +1195,10 @@ static struct config_int ConfigureNamesInt[] = }, /* - * Note: There is some postprocessing done in PostmasterMain() to make - * sure the buffers are at least twice the number of backends, so the - * constraints here are partially unused. Similarly, the superuser - * reserved number is checked to ensure it is less than the max backends - * number. - * - * MaxBackends is limited to INT_MAX/4 because some places compute - * 4*MaxBackends without any overflow check. This check is made on + * Note: MaxBackends is limited to INT_MAX/4 because some places compute + * 4*MaxBackends without any overflow check. This check is made in * assign_maxconnections, since MaxBackends is computed as MaxConnections - * + autovacuum_max_workers. + * plus autovacuum_max_workers. * * Likewise we have to limit NBuffers to INT_MAX/2. */ diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 258a7d1a4f5..d3604c2d5c0 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -60,8 +60,7 @@ #port = 5432 # (change requires restart) #max_connections = 100 # (change requires restart) # Note: Increasing max_connections costs ~400 bytes of shared memory per -# connection slot, plus lock space (see max_locks_per_transaction). You might -# also need to raise shared_buffers to support more connections. +# connection slot, plus lock space (see max_locks_per_transaction). #superuser_reserved_connections = 3 # (change requires restart) #unix_socket_directory = '' # (change requires restart) #unix_socket_group = '' # (change requires restart) @@ -104,7 +103,7 @@ # - Memory - -#shared_buffers = 32MB # min 128kB or max_connections*16kB +#shared_buffers = 32MB # min 128kB # (change requires restart) #temp_buffers = 8MB # min 800kB #max_prepared_transactions = 5 # can be 0 or more |