opuppet/module-puppetdb
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #232 from kpaulisse/kpaulisse-dbconnections

Browse source 
Manage the pool size configuration parameters in database.ini
This commit is contained in:
Andrew Roetker 2016-06-23 12:57:03 -07:00 committed by GitHub
commit 27ce82b11b
6 changed files with 182 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/init.pp
View file

@ -70,6 +70,8 @@ class puppetdb (
$temp_usage = $puppetdb::params::temp_usage, $temp_usage = $puppetdb::params::temp_usage,
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file, $certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
$certificate_whitelist = $puppetdb::params::certificate_whitelist, $certificate_whitelist = $puppetdb::params::certificate_whitelist,
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
) inherits puppetdb::params { ) inherits puppetdb::params {
class { '::puppetdb::server': class { '::puppetdb::server':
@ -138,6 +140,8 @@ class puppetdb (
temp_usage => $temp_usage, temp_usage => $temp_usage,
certificate_whitelist_file => $certificate_whitelist_file, certificate_whitelist_file => $certificate_whitelist_file,
certificate_whitelist => $certificate_whitelist, certificate_whitelist => $certificate_whitelist,
database_max_pool_size => $database_max_pool_size,
read_database_max_pool_size => $read_database_max_pool_size,
} }
if ($database == 'postgres') { if ($database == 'postgres') {

27
manifests/params.pp
View file

@ -20,14 +20,15 @@ class puppetdb::params inherits puppetdb::globals {
$postgres_version = '9.4' $postgres_version = '9.4'
# The remaining database settings are not used for an embedded database # The remaining database settings are not used for an embedded database
$database_host = 'localhost' $database_host = 'localhost'
$database_port = '5432' $database_port = '5432'
$database_name = 'puppetdb' $database_name = 'puppetdb'
$database_username = 'puppetdb' $database_username = 'puppetdb'
$database_password = 'puppetdb' $database_password = 'puppetdb'
$database_ssl = undef $database_ssl = undef
$jdbc_ssl_properties = '' $jdbc_ssl_properties = ''
$database_validate = true $database_validate = true
$database_max_pool_size = undef
# These settings manage the various auto-deactivation and auto-purge settings # These settings manage the various auto-deactivation and auto-purge settings
$node_ttl = '0s' $node_ttl = '0s'
@ -57,6 +58,7 @@ class puppetdb::params inherits puppetdb::globals {
$read_conn_max_age = '60' $read_conn_max_age = '60'
$read_conn_keep_alive = '45' $read_conn_keep_alive = '45'
$read_conn_lifetime = '0' $read_conn_lifetime = '0'
$read_database_max_pool_size = undef
$manage_firewall = true $manage_firewall = true
$java_args = {} $java_args = {}
@ -173,4 +175,13 @@ class puppetdb::params inherits puppetdb::globals {
$certificate_whitelist = [ ] $certificate_whitelist = [ ]
# change to this to only allow access by the puppet master by default: # change to this to only allow access by the puppet master by default:
#$certificate_whitelist = [ $::servername ] #$certificate_whitelist = [ $::servername ]
# Get the parameter name for the database connection pool tuning
if $puppetdb_version in ['latest','present'] or versioncmp($puppetdb_version, '4.0.0') >= 0 {
$database_max_pool_size_setting_name = 'maximum-pool-size'
} elsif versioncmp($puppetdb_version, '2.8.0') >= 0 {
$database_max_pool_size_setting_name = 'partition-conn-max'
} else {
$database_max_pool_size_setting_name = undef
}
} }

38
manifests/server.pp
View file

@ -65,6 +65,8 @@ class puppetdb::server (
$temp_usage = $puppetdb::params::temp_usage, $temp_usage = $puppetdb::params::temp_usage,
$certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file, $certificate_whitelist_file = $puppetdb::params::certificate_whitelist_file,
$certificate_whitelist = $puppetdb::params::certificate_whitelist, $certificate_whitelist = $puppetdb::params::certificate_whitelist,
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
$read_database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
) inherits puppetdb::params { ) inherits puppetdb::params {
# deprecation warnings # deprecation warnings
if $database_ssl != undef { if $database_ssl != undef {
@ -160,6 +162,7 @@ class puppetdb::server (
database_password => $database_password, database_password => $database_password,
database_name => $database_name, database_name => $database_name,
database_ssl => $database_ssl, database_ssl => $database_ssl,
database_max_pool_size => $database_max_pool_size,
jdbc_ssl_properties => $jdbc_ssl_properties, jdbc_ssl_properties => $jdbc_ssl_properties,
database_validate => $database_validate, database_validate => $database_validate,
database_embedded_path => $database_embedded_path, database_embedded_path => $database_embedded_path,
@ -178,23 +181,24 @@ class puppetdb::server (
} }
class { 'puppetdb::server::read_database': class { 'puppetdb::server::read_database':
database => $read_database, database => $read_database,
database_host => $read_database_host, database_host => $read_database_host,
database_port => $read_database_port, database_port => $read_database_port,
database_username => $read_database_username, database_username => $read_database_username,
database_password => $read_database_password, database_password => $read_database_password,
database_name => $read_database_name, database_name => $read_database_name,
database_ssl => $read_database_ssl, database_ssl => $read_database_ssl,
jdbc_ssl_properties => $read_database_jdbc_ssl_properties, jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
database_validate => $read_database_validate, database_validate => $read_database_validate,
log_slow_statements => $read_log_slow_statements, log_slow_statements => $read_log_slow_statements,
conn_max_age => $read_conn_max_age, conn_max_age => $read_conn_max_age,
conn_keep_alive => $read_conn_keep_alive, conn_keep_alive => $read_conn_keep_alive,
conn_lifetime => $read_conn_lifetime, conn_lifetime => $read_conn_lifetime,
confdir => $confdir, confdir => $confdir,
puppetdb_user => $puppetdb_user, puppetdb_user => $puppetdb_user,
puppetdb_group => $puppetdb_group, puppetdb_group => $puppetdb_group,
notify => Service[$puppetdb_service], notify => Service[$puppetdb_service],
database_max_pool_size => $read_database_max_pool_size,
} }
if str2bool($ssl_set_cert_paths) == true if str2bool($ssl_set_cert_paths) == true

15
manifests/server/database.pp
View file

@ -21,6 +21,7 @@ class puppetdb::server::database (
$confdir = $puppetdb::params::confdir, $confdir = $puppetdb::params::confdir,
$puppetdb_user = $puppetdb::params::puppetdb_user, $puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group, $puppetdb_group = $puppetdb::params::puppetdb_group,
$database_max_pool_size = $puppetdb::params::database_max_pool_size,
) inherits puppetdb::params { ) inherits puppetdb::params {
if str2bool($database_validate) { if str2bool($database_validate) {
@ -159,4 +160,18 @@ class puppetdb::server::database (
setting => 'conn-lifetime', setting => 'conn-lifetime',
value => $conn_lifetime, value => $conn_lifetime,
} }
if $puppetdb::params::database_max_pool_size_setting_name != undef {
if $database_max_pool_size == 'absent' {
ini_setting { 'puppetdb_database_max_pool_size':
ensure => absent,
setting => $puppetdb::params::database_max_pool_size_setting_name,
}
} elsif $database_max_pool_size != undef {
ini_setting { 'puppetdb_database_max_pool_size':
setting => $puppetdb::params::database_max_pool_size_setting_name,
value => $database_max_pool_size,
}
}
}
} }

47
manifests/server/read_database.pp
View file

@ -1,21 +1,22 @@
# PRIVATE CLASS - do not use directly # PRIVATE CLASS - do not use directly
class puppetdb::server::read_database ( class puppetdb::server::read_database (
$database = $puppetdb::params::read_database, $database = $puppetdb::params::read_database,
$database_host = $puppetdb::params::read_database_host, $database_host = $puppetdb::params::read_database_host,
$database_port = $puppetdb::params::read_database_port, $database_port = $puppetdb::params::read_database_port,
$database_username = $puppetdb::params::read_database_username, $database_username = $puppetdb::params::read_database_username,
$database_password = $puppetdb::params::read_database_password, $database_password = $puppetdb::params::read_database_password,
$database_name = $puppetdb::params::read_database_name, $database_name = $puppetdb::params::read_database_name,
$database_ssl = $puppetdb::params::read_database_ssl, $database_ssl = $puppetdb::params::read_database_ssl,
$jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties, $jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
$database_validate = $puppetdb::params::read_database_validate, $database_validate = $puppetdb::params::read_database_validate,
$log_slow_statements = $puppetdb::params::read_log_slow_statements, $log_slow_statements = $puppetdb::params::read_log_slow_statements,
$conn_max_age = $puppetdb::params::read_conn_max_age, $conn_max_age = $puppetdb::params::read_conn_max_age,
$conn_keep_alive = $puppetdb::params::read_conn_keep_alive, $conn_keep_alive = $puppetdb::params::read_conn_keep_alive,
$conn_lifetime = $puppetdb::params::read_conn_lifetime, $conn_lifetime = $puppetdb::params::read_conn_lifetime,
$confdir = $puppetdb::params::confdir, $confdir = $puppetdb::params::confdir,
$puppetdb_user = $puppetdb::params::puppetdb_user, $puppetdb_user = $puppetdb::params::puppetdb_user,
$puppetdb_group = $puppetdb::params::puppetdb_group, $puppetdb_group = $puppetdb::params::puppetdb_group,
$database_max_pool_size = $puppetdb::params::read_database_max_pool_size,
) inherits puppetdb::params { ) inherits puppetdb::params {
# Only add the read database configuration if database host is defined. # Only add the read database configuration if database host is defined.
@ -129,6 +130,20 @@ class puppetdb::server::read_database (
setting => 'conn-lifetime', setting => 'conn-lifetime',
value => $conn_lifetime, value => $conn_lifetime,
} }
if $puppetdb::params::database_max_pool_size_setting_name != undef {
if $database_max_pool_size == 'absent' {
ini_setting { 'puppetdb_read_database_max_pool_size':
ensure => absent,
setting => $puppetdb::params::database_max_pool_size_setting_name,
}
} elsif $database_max_pool_size != undef {
ini_setting { 'puppetdb_read_database_max_pool_size':
setting => $puppetdb::params::database_max_pool_size_setting_name,
value => $database_max_pool_size,
}
}
}
} else { } else {
file { "${confdir}/read_database.ini": file { "${confdir}/read_database.ini":
ensure => absent, ensure => absent,

92
spec/unit/classes/server/database_ini_spec.rb
View file

@ -125,6 +125,7 @@ describe 'puppetdb::server::database', :type => :class do
'setting' => 'conn-lifetime', 'setting' => 'conn-lifetime',
'value' => '0' 'value' => '0'
)} )}
it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
end end
describe 'when using a legacy PuppetDB version' do describe 'when using a legacy PuppetDB version' do
@ -233,6 +234,7 @@ describe 'puppetdb::server::database', :type => :class do
'setting' => 'conn-lifetime', 'setting' => 'conn-lifetime',
'value' => '0' 'value' => '0'
)} )}
it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
end end
describe 'when overriding database_path for embedded' do describe 'when overriding database_path for embedded' do
@ -251,5 +253,95 @@ describe 'puppetdb::server::database', :type => :class do
'value' => 'file:/tmp/foo;hsqldb.tx=mvcc;sql.syntax_pgs=true' 'value' => 'file:/tmp/foo;hsqldb.tx=mvcc;sql.syntax_pgs=true'
)} )}
end end
describe 'when setting max pool size' do
context 'on current PuppetDB' do
describe 'to a numeric value' do
let(:params) do
{
'database_max_pool_size' => 12345
}
end
it { should contain_ini_setting('puppetdb_database_max_pool_size').
with(
'ensure' => 'present',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'maximum-pool-size',
'value' => '12345'
)}
end
describe 'to absent' do
let(:params) do
{
'database_max_pool_size' => 'absent'
}
end
it { should contain_ini_setting('puppetdb_database_max_pool_size').
with(
'ensure' => 'absent',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'maximum-pool-size'
)}
end
end
context 'on PuppetDB 3.2' do
let (:pre_condition) { 'class { "puppetdb::globals": version => "3.2.0", }' }
describe 'to a numeric value' do
let(:params) do
{
'database_max_pool_size' => 12345
}
end
it { should contain_ini_setting('puppetdb_database_max_pool_size').
with(
'ensure' => 'present',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'partition-conn-max',
'value' => '12345'
)}
end
describe 'to absent' do
let(:params) do
{
'database_max_pool_size' => 'absent'
}
end
it { should contain_ini_setting('puppetdb_database_max_pool_size').
with(
'ensure' => 'absent',
'path' => '/etc/puppetlabs/puppetdb/conf.d/database.ini',
'section' => 'database',
'setting' => 'partition-conn-max'
)}
end
end
context 'on a legacy PuppetDB version' do
let (:pre_condition) { 'class { "puppetdb::globals": version => "2.2.0", }' }
describe 'to a numeric value' do
let(:params) do
{
'database_max_pool_size' => 12345
}
end
it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
end
describe 'to absent' do
let(:params) do
{
'database_max_pool_size' => 'absent'
}
end
it { should_not contain_ini_setting('puppetdb_database_max_pool_size') }
end
end
end
end end
end end