openstack/puppet-watcher
Code Issues Proposed changes

Deprecate min_pool_size option

Browse Source 
min_pool_size option is not used，see:

https://review.opendev.org/#/c/565090/

Change-Id: Idaeca3097df5d7752fcbeecb4216061b1d278924
Closes-Bug: #1868511
This commit is contained in:
ZhongShengping 2020-03-25 14:53:41 +08:00
parent 1fcc9a3e2c
commit 7ff40f5a57
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifests/db.pp
View File

@ -26,10 +26,6 @@
# (Optional) Interval between retries of opening a database connection.
# Defaults to $::os_service_default
#
# [*database_min_pool_size*]
# (Optional) Minimum number of SQL connections to keep open in a pool.
# Defaults to $::os_service_default
#
# [*database_max_pool_size*]
# (Optional) Maximum number of SQL connections to keep open in a pool.
# Defaults to $::os_service_default
@ -42,27 +38,37 @@
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*database_min_pool_size*]
# (Optional) Minimum number of SQL connections to keep open in a pool.
# Defaults to undef
#
class watcher::db (
$database_connection = 'sqlite:////var/lib/watcher/watcher.sqlite',
$database_connection_recycle_time = $::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,
$database_pool_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {
include watcher::deps
if $database_min_pool_size {
warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
}
validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection,
['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?'])
oslo::db { 'watcher_config':
connection => $database_connection,
connection_recycle_time => $database_connection_recycle_time,
min_pool_size => $database_min_pool_size,
db_max_retries => $database_db_max_retries,
max_retries => $database_max_retries,
retry_interval => $database_retry_interval,

4
releasenotes/notes/deprecate_database_min_pool_size-option-8876b9fb67414556.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- database_min_pool_size option is now deprecated for removal, the
parameter has no effect.

3
spec/classes/watcher_db_spec.rb
View File

@ -9,7 +9,6 @@ describe 'watcher::db' do
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/watcher/watcher.sqlite',
:connection_recycle_time => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
@ -23,7 +22,6 @@ describe 'watcher::db' do
{
:database_connection => 'mysql+pymysql://watcher:watcher@localhost/watcher',
:database_connection_recycle_time => '3601',
:database_min_pool_size => '2',
:database_db_max_retries => '-1',
:database_max_retries => '11',
:database_retry_interval => '11',
@ -39,7 +37,6 @@ describe 'watcher::db' do
:db_max_retries => '-1',
:connection => 'mysql+pymysql://watcher:watcher@localhost/watcher',
:connection_recycle_time => '3601',
:min_pool_size => '2',
:max_pool_size => '11',
:max_retries => '11',
:retry_interval => '11',