Page MenuHomeSoftware Heritage
Files F9342083

D6406.diff
No OneTemporary
Actions

D6406.diff
View Options

diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -3605,3 +3605,5 @@
nodejs::version: 14.x
swh::provenance::db::shared_buffers: 32GB
+
+swh::postgresql::max_connections: 100
\ No newline at end of file
diff --git a/data/hostname/met.internal.softwareheritage.org.yaml b/data/hostname/met.internal.softwareheritage.org.yaml
--- a/data/hostname/met.internal.softwareheritage.org.yaml
+++ b/data/hostname/met.internal.softwareheritage.org.yaml
@@ -68,6 +68,7 @@
# using an indirection to allow the override for vagrant
swh::postgresql::shared_buffers: "%{lookup('swh::provenance::db::shared_buffers')}"
+swh::postgresql::max_connections: 1000
postgresql::server::config_entries:
shared_buffers: "%{alias('swh::postgresql::shared_buffers')}"
diff --git a/site-modules/profile/manifests/postgresql/server.pp b/site-modules/profile/manifests/postgresql/server.pp
--- a/site-modules/profile/manifests/postgresql/server.pp
+++ b/site-modules/profile/manifests/postgresql/server.pp
@@ -14,9 +14,10 @@
$postgres_port = lookup('swh::postgresql::port')
$postgres_datadir_base = lookup('swh::postgresql::datadir_base')
$postgres_datadir = lookup('swh::postgresql::datadir')
+ $postgres_max_connections = lookup('swh::postgresql::max_connections')
$ip_mask_allow_all_users = '0.0.0.0/0'
- file { [ "${postgres_datadir_base}",
+ file { [ $postgres_datadir_base,
"${postgres_datadir_base}/${postgres_version}" ] :
ensure => directory,
owner => 'root',
@@ -36,14 +37,14 @@
pg_hba_rules => {
# Supersedes the default rules installed by puppetlab-postgres, thus
# allowing pgbouncer/pgsql connection to the postgres user
- 'local access as postgres user' => {
+ 'local access as postgres user' => {
database => 'all',
user => 'postgres',
type => 'local',
auth_method => 'ident',
order => 1,
},
- 'local access to database with same name' => {
+ 'local access to database with same name' => {
database => 'all',
user => 'all',
type => 'local',
@@ -58,7 +59,7 @@
auth_method => 'md5',
order => 3,
},
- 'allow access to all users' => {
+ 'allow access to all users' => {
database => 'all',
user => 'all',
type => 'host',
@@ -66,7 +67,7 @@
auth_method => 'md5',
order => 100,
},
- 'allow access to ipv6 localhost' => {
+ 'allow access to ipv6 localhost' => {
database => 'all',
user => 'all',
type => 'host',
@@ -74,13 +75,18 @@
auth_method => 'md5',
order => 101,
}
- }
+ },
+ }
+
+ postgresql::server::config_entry{'max_connections':
+ ensure => present,
+ value => $postgres_max_connections,
}
postgresql::server::config_entry{'shared_preload_libraries':
ensure => present,
- value => "pg_stat_statements",
- }
+ value => 'pg_stat_statements',
+ }
# read-only user
$guest = 'guest'
@@ -94,7 +100,7 @@
# db_type in {storage, indexer, scheduler, etc...}
$db_pass = pick(
$db_config['password'],
- lookup("swh::deploy::${db_type}::db::password", {"default_value" => undef})
+ lookup("swh::deploy::${db_type}::db::password", {'default_value' => undef})
)
$db_name = $db_config['name']
$db_user = $db_config['user']

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 3, 12:28 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3216515

Event Timeline

About · Developer information · Legal