From 5a89c5a0024681dd4908fb44e576e5594949cc6d Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 25 Mar 2020 14:53:41 +0800 Subject: [PATCH] Deprecate min_pool_size option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit min_pool_size option is not used，see: https://review.opendev.org/#/c/565090/ Change-Id: Ia6d09856e71e42bfa12b91a49735798bfed9818f Closes-Bug: #1868511 --- manifests/db.pp | 19 ++++++++++++------- manifests/init.pp | 4 ---- ...min_pool_size-option-848a4c6b7de5dea7.yaml | 4 ++++ spec/classes/mistral_db_spec.rb | 3 --- 4 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/deprecate_database_min_pool_size-option-848a4c6b7de5dea7.yaml diff --git a/manifests/db.pp b/manifests/db.pp index 71647ed..5396ad5 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -12,10 +12,6 @@ # Timeout when db connections should be reaped. # (Optional) Defaults to $::os_service_default # -# [*database_min_pool_size*] -# Minimum number of SQL connections to keep open in a pool. -# (Optional) Defaults to $::os_service_default -# # [*database_max_pool_size*] # Maximum number of SQL connections to keep open in a pool. # (Optional) Defaults to $::os_service_default @@ -42,25 +38,35 @@ # before error is raised. Set to -1 to specify an infinite retry count. # Defaults to $::os_service_default # +# DEPRECATED PARAMETERS +# +# [*database_min_pool_size*] +# Minimum number of SQL connections to keep open in a pool. +# (Optional) Defaults to undef +# class mistral::db ( $database_connection = 'sqlite:////var/lib/mistral/mistral.sqlite', $database_connection_recycle_time = $::os_service_default, - $database_min_pool_size = $::os_service_default, $database_max_pool_size = $::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, $database_db_max_retries = $::os_service_default, + # DEPRECATED PARAMETERS + $database_min_pool_size = undef, ) { include mistral::deps + if $database_min_pool_size { + warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.') + } + # NOTE(spredzy): In order to keep backward compatibility we rely on the pick function # to use mistral:: if mistral::db:: isn't specified. $database_connection_real = pick($::mistral::database_connection,$database_connection) $database_connection_recycle_time_real = pick($::mistral::database_idle_timeout, $database_connection_recycle_time) - $database_min_pool_size_real = pick($::mistral::database_min_pool_size,$database_min_pool_size) $database_max_pool_size_real = pick($::mistral::database_max_pool_size,$database_max_pool_size) $database_max_retries_real = pick($::mistral::database_max_retries,$database_max_retries) $database_retry_interval_real = pick($::mistral::database_retry_interval,$database_retry_interval) @@ -72,7 +78,6 @@ class mistral::db ( oslo::db { 'mistral_config': connection => $database_connection_real, connection_recycle_time => $database_connection_recycle_time_real, - min_pool_size => $database_min_pool_size_real, max_pool_size => $database_max_pool_size_real, max_retries => $database_max_retries_real, retry_interval => $database_retry_interval_real, diff --git a/manifests/init.pp b/manifests/init.pp index acace84..70c7a52 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -21,10 +21,6 @@ # Timeout when db connections should be reaped. # (Optional) Defaults to undef. # -# [*database_min_pool_size*] -# Minimum number of SQL connections to keep open in a pool. -# (Optional) Defaults to undef. -# # [*database_max_pool_size*] # Maximum number of SQL connections to keep open in a pool. # (Optional) Defaults to undef. diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-848a4c6b7de5dea7.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-848a4c6b7de5dea7.yaml new file mode 100644 index 0000000..03e58c2 --- /dev/null +++ b/releasenotes/notes/deprecate_database_min_pool_size-option-848a4c6b7de5dea7.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - database_min_pool_size option is now deprecated for removal, the + parameter has no effect. diff --git a/spec/classes/mistral_db_spec.rb b/spec/classes/mistral_db_spec.rb index 1a0ab52..0d0fe45 100644 --- a/spec/classes/mistral_db_spec.rb +++ b/spec/classes/mistral_db_spec.rb @@ -9,7 +9,6 @@ describe 'mistral::db' do :db_max_retries => '', :connection => 'sqlite:////var/lib/mistral/mistral.sqlite', :connection_recycle_time => '', - :min_pool_size => '', :max_pool_size => '', :max_retries => '', :retry_interval => '', @@ -23,7 +22,6 @@ describe 'mistral::db' do { :database_connection => 'mysql+pymysql://mistral:mistral@localhost/mistral', :database_connection_recycle_time => '3601', - :database_min_pool_size => '2', :database_max_pool_size => '11', :database_max_retries => '11', :database_retry_interval => '11', @@ -39,7 +37,6 @@ describe 'mistral::db' do :db_max_retries => '-1', :connection => 'mysql+pymysql://mistral:mistral@localhost/mistral', :connection_recycle_time => '3601', - :min_pool_size => '2', :max_pool_size => '11', :max_retries => '11', :retry_interval => '11',