openstack
/
puppet-ec2api
Code Issues Proposed changes

Add support for db_max_retries param 

The db_max_retries parameter regulates the number of reconnection
attempts performed after an error raised rather than at startup.

Change-Id: Ie38148a1826a75327de61b91007ce7cc825c2b80
Closes-Bug: 1579718
This commit is contained in:
ZhongShengping 2016-10-25 14:53:46 +08:00
parent b1bafda1ce
commit ed10140650
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/db.pp
View File

@ -4,6 +4,11 @@
#
# === Parameters
#
# [*database_db_max_retries*]
# (optional) Maximum retries in case of connection error or deadlock error
# before error is raised. Set to -1 to specify an infinite retry count.
# Defaults to $::os_service_default
#
# [*database_connection*]
# Url used to connect to database.
# (Optional) Defaults to "sqlite:////var/lib/ec2api/ec2api.sqlite".
@ -38,6 +43,7 @@ class ec2api::db (
$database_idle_timeout = $::os_service_default,
$database_min_pool_size = $::os_service_default,
$database_max_pool_size = $::os_service_default,
$database_db_max_retries = $::os_service_default,
$database_max_retries = $::os_service_default,
$database_retry_interval = $::os_service_default,
$database_max_overflow = $::os_service_default,
@ -49,6 +55,7 @@ class ec2api::db (
connection => $database_connection,
idle_timeout => $database_idle_timeout,
min_pool_size => $database_min_pool_size,
db_max_retries => $database_db_max_retries,
max_retries => $database_max_retries,
retry_interval => $database_retry_interval,
max_pool_size => $database_max_pool_size,

3
spec/classes/ec2api_db_spec.rb
View File

@ -15,6 +15,7 @@ describe 'ec2api::db' do
:connection => 'sqlite:////var/lib/ec2api/ec2api.sqlite',
:idle_timeout => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:db_max_retries => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',
@ -30,6 +31,7 @@ describe 'ec2api::db' do
:database_connection => 'sqlite:////path/to/my/db.sqlite',
:database_idle_timeout => '1',
:database_min_pool_size => '2',
:database_db_max_retries => '-1',
:database_max_retries => '3',
:database_retry_interval => '4',
:database_max_pool_size => '5',
@ -45,6 +47,7 @@ describe 'ec2api::db' do
:connection => 'sqlite:////path/to/my/db.sqlite',
:idle_timeout => '1',
:min_pool_size => '2',
:db_max_retries => '-1',
:max_retries => '3',
:retry_interval => '4',
:max_pool_size => '5',