Deprecate idle_timeout option
The idle_timeout parameter is deprecated, use connection_recycle_time instead[1]. [1]https://review.opendev.org/#/c/334182/ Change-Id: Ifb876685e27df60f400105564b62eaf06be30287 Depends-On: https://review.opendev.org/656106/ Closes-Bug: #1826692
This commit is contained in:
parent
d6d5fbaa3b
commit
2cbfbf7d5f
@ -8,7 +8,7 @@
|
|||||||
# Url used to connect to database.
|
# Url used to connect to database.
|
||||||
# (Optional) Defaults to 'sqlite:////var/lib/trove/trove.sqlite'.
|
# (Optional) Defaults to 'sqlite:////var/lib/trove/trove.sqlite'.
|
||||||
#
|
#
|
||||||
# [*database_idle_timeout*]
|
# [*database_connection_recycle_time*]
|
||||||
# Timeout when db connections should be reaped.
|
# Timeout when db connections should be reaped.
|
||||||
# (Optional) Defaults to 3600.
|
# (Optional) Defaults to 3600.
|
||||||
#
|
#
|
||||||
@ -37,23 +37,36 @@
|
|||||||
# (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_idle_timeout*]
|
||||||
|
# Timeout when db connections should be reaped.
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
class trove::db (
|
class trove::db (
|
||||||
$database_connection = 'sqlite:////var/lib/trove/trove.sqlite',
|
$database_connection = 'sqlite:////var/lib/trove/trove.sqlite',
|
||||||
$database_idle_timeout = $::os_service_default,
|
$database_connection_recycle_time = $::os_service_default,
|
||||||
$database_min_pool_size = $::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_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_idle_timeout = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::trove::deps
|
include ::trove::deps
|
||||||
|
|
||||||
|
if $database_idle_timeout {
|
||||||
|
warning('The database_idle_timeout parameter is deprecated. Please use \
|
||||||
|
database_connection_recycle_time instead.')
|
||||||
|
}
|
||||||
|
|
||||||
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
|
||||||
# to use trove::<myparam> if trove::db::<myparam> isn't specified.
|
# to use trove::<myparam> if trove::db::<myparam> isn't specified.
|
||||||
$database_connection_real = pick($::trove::database_connection, $database_connection)
|
$database_connection_real = pick($::trove::database_connection, $database_connection)
|
||||||
$database_idle_timeout_real = pick($::trove::database_idle_timeout, $database_idle_timeout)
|
$database_connection_recycle_time_real = pick($::trove::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time)
|
||||||
$database_min_pool_size_real = pick($::trove::database_min_pool_size, $database_min_pool_size)
|
$database_min_pool_size_real = pick($::trove::database_min_pool_size, $database_min_pool_size)
|
||||||
$database_max_pool_size_real = pick($::trove::database_max_pool_size, $database_max_pool_size)
|
$database_max_pool_size_real = pick($::trove::database_max_pool_size, $database_max_pool_size)
|
||||||
$database_max_retries_real = pick($::trove::database_max_retries, $database_max_retries)
|
$database_max_retries_real = pick($::trove::database_max_retries, $database_max_retries)
|
||||||
@ -65,7 +78,7 @@ class trove::db (
|
|||||||
|
|
||||||
oslo::db { 'trove_config':
|
oslo::db { 'trove_config':
|
||||||
connection => $database_connection_real,
|
connection => $database_connection_real,
|
||||||
idle_timeout => $database_idle_timeout_real,
|
connection_recycle_time => $database_connection_recycle_time_real,
|
||||||
min_pool_size => $database_min_pool_size_real,
|
min_pool_size => $database_min_pool_size_real,
|
||||||
max_pool_size => $database_max_pool_size_real,
|
max_pool_size => $database_max_pool_size_real,
|
||||||
max_retries => $database_max_retries_real,
|
max_retries => $database_max_retries_real,
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- database_idle_timeout is deprecated and will be removed in a future
|
||||||
|
release. Please use database_connection_recycle_time instead.
|
@ -7,7 +7,7 @@ describe 'trove::db' do
|
|||||||
|
|
||||||
it { should contain_oslo__db('trove_config').with(
|
it { should contain_oslo__db('trove_config').with(
|
||||||
:connection => 'sqlite:////var/lib/trove/trove.sqlite',
|
:connection => 'sqlite:////var/lib/trove/trove.sqlite',
|
||||||
:idle_timeout => '<SERVICE DEFAULT>',
|
:connection_recycle_time => '<SERVICE DEFAULT>',
|
||||||
:min_pool_size => '<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>',
|
||||||
@ -21,7 +21,7 @@ describe 'trove::db' do
|
|||||||
let :params do
|
let :params do
|
||||||
{
|
{
|
||||||
:database_connection => 'mysql+pymysql://trove:trove@localhost/trove',
|
:database_connection => 'mysql+pymysql://trove:trove@localhost/trove',
|
||||||
:database_idle_timeout => '3601',
|
:database_connection_recycle_time => '3601',
|
||||||
:database_min_pool_size => '2',
|
:database_min_pool_size => '2',
|
||||||
:database_max_pool_size => '21',
|
:database_max_pool_size => '21',
|
||||||
:database_max_retries => '11',
|
:database_max_retries => '11',
|
||||||
@ -35,7 +35,7 @@ describe 'trove::db' do
|
|||||||
|
|
||||||
it { should contain_oslo__db('trove_config').with(
|
it { should contain_oslo__db('trove_config').with(
|
||||||
:connection => 'mysql+pymysql://trove:trove@localhost/trove',
|
:connection => 'mysql+pymysql://trove:trove@localhost/trove',
|
||||||
:idle_timeout => '3601',
|
:connection_recycle_time => '3601',
|
||||||
:min_pool_size => '2',
|
:min_pool_size => '2',
|
||||||
:max_pool_size => '21',
|
:max_pool_size => '21',
|
||||||
:max_retries => '11',
|
:max_retries => '11',
|
||||||
|
Loading…
Reference in New Issue
Block a user