Deprecate min_pool_size option

min_pool_size option is not used,see:

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

Change-Id: I9ed5232062a12ba6df12aac5b6e08aa6138df88c
Closes-Bug: #1868511
This commit is contained in:
ZhongShengping 2020-03-25 14:53:40 +08:00
parent d3268e989c
commit 14bf9b339c
3 changed files with 16 additions and 9 deletions

View File

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

View File

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

View File

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