aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2012-08-10 14:49:03 +0200
committerMagnus Hagander <magnus@hagander.net>2012-08-10 14:52:16 +0200
commit64d64a0530a57b4f949fc6d96ebc8d8318b63cdb (patch)
treed126d8beda4c51be2cb2ab203fbb56bbf02bc509 /src
parent2bf6e8cbc0717f4cac8caabea644628fbf5d9563 (diff)
downloadpostgresql-64d64a0530a57b4f949fc6d96ebc8d8318b63cdb.tar.gz
postgresql-64d64a0530a57b4f949fc6d96ebc8d8318b63cdb.zip
Fix upper limit of superuser_reserved_connections, add limit for wal_senders
Should be limited to the maximum number of connections excluding autovacuum workers, not including. Add similar check for max_wal_senders, which should never be higher than max_connections.
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/postmaster.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index ea2784d6083..8b181824d2e 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -731,11 +731,16 @@ PostmasterMain(int argc, char *argv[])
/*
* Check for invalid combinations of GUC settings.
*/
- if (ReservedBackends >= MaxBackends)
+ if (ReservedBackends >= MaxConnections)
{
write_stderr("%s: superuser_reserved_connections must be less than max_connections\n", progname);
ExitPostmaster(1);
}
+ if (max_wal_senders >= MaxConnections)
+ {
+ write_stderr("%s: max_wal_senders must be less than max_connections\n", progname);
+ ExitPostmaster(1);
+ }
if (XLogArchiveMode && wal_level == WAL_LEVEL_MINIMAL)
ereport(ERROR,
(errmsg("WAL archival (archive_mode=on) requires wal_level \"archive\" or \"hot_standby\"")));