From 3489c25a0fe9ed36a749f6ebed802581fae64f81 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: I683baa116b82a5e1b3cc2242c351d1105f676e32 Closes-Bug: #1868511 --- manifests/db.pp | 16 +++++++++------- manifests/server.pp | 13 ++++++++----- ...se_min_pool_size-option-97e8e45acaf1d953.yaml | 4 ++++ spec/classes/neutron_db_spec.rb | 3 --- spec/classes/neutron_server_spec.rb | 1 - 5 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/deprecate_database_min_pool_size-option-97e8e45acaf1d953.yaml diff --git a/manifests/db.pp b/manifests/db.pp index 38ca358a1..970e7d7ba 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. @@ -48,10 +44,13 @@ # Timeout when db connections should be reaped. # Defaults to undef. # +# [*database_min_pool_size*] +# Minimum number of SQL connections to keep open in a pool. +# (Optional) Defaults to undef. +# class neutron::db ( $database_connection = 'sqlite:////var/lib/neutron/ovs.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, @@ -60,6 +59,7 @@ class neutron::db ( $database_db_max_retries = $::os_service_default, # DEPRECATED PARAMETERS $database_idle_timeout = undef, + $database_min_pool_size = undef, ) { include neutron::deps @@ -69,12 +69,15 @@ class neutron::db ( database_connection_recycle_time instead.') } + if $::neutron::server::database_min_pool_size or $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 neutron:: if neutron::db:: isn't specified. $database_connection_real = pick($::neutron::server::database_connection, $database_connection) $database_connection_recycle_time_real = pick($::neutron::server::database_idle_timeout, $database_idle_timeout, $database_connection_recycle_time) - $database_min_pool_size_real = pick($::neutron::server::database_min_pool_size, $database_min_pool_size) $database_max_pool_size_real = pick($::neutron::server::database_max_pool_size, $database_max_pool_size) $database_max_retries_real = pick($::neutron::server::database_max_retries, $database_max_retries) $database_retry_interval_real = pick($::neutron::server::database_retry_interval, $database_retry_interval) @@ -88,7 +91,6 @@ database_connection_recycle_time instead.') oslo::db { 'neutron_config': connection => $database_connection_real, connection_recycle_time => $database_connection_recycle_time_real, - min_pool_size => $database_min_pool_size_real, max_retries => $database_max_retries_real, retry_interval => $database_retry_interval_real, max_pool_size => $database_max_pool_size_real, diff --git a/manifests/server.pp b/manifests/server.pp index 86cde905c..c8e76470d 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -75,10 +75,6 @@ # (Optional) Interval between retries of opening a database connection. # (Defaults to 10) # -# [*database_min_pool_size*] -# (Optional) Minimum number of SQL connections to keep open in a pool. -# Defaults to: undef. -# # [*database_max_pool_size*] # (Optional) Maximum number of SQL connections to keep open in a pool. # Defaults to: undef. @@ -259,6 +255,12 @@ # mechanism driver for Neutron. # 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 neutron::server ( $package_ensure = 'present', $enabled = true, @@ -274,7 +276,6 @@ class neutron::server ( $database_max_retries = undef, $database_idle_timeout = undef, $database_retry_interval = undef, - $database_min_pool_size = undef, $database_max_pool_size = undef, $database_max_overflow = undef, $sync_db = false, @@ -305,6 +306,8 @@ class neutron::server ( $max_request_body_size = $::os_service_default, $ovs_integration_bridge = $::os_service_default, $igmp_snooping_enable = $::os_service_default, + # DEPRECATED PARAMETERS + $database_min_pool_size = undef, ) inherits ::neutron::params { include neutron::deps diff --git a/releasenotes/notes/deprecate_database_min_pool_size-option-97e8e45acaf1d953.yaml b/releasenotes/notes/deprecate_database_min_pool_size-option-97e8e45acaf1d953.yaml new file mode 100644 index 000000000..03e58c2ba --- /dev/null +++ b/releasenotes/notes/deprecate_database_min_pool_size-option-97e8e45acaf1d953.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/neutron_db_spec.rb b/spec/classes/neutron_db_spec.rb index ebd57566c..85a2e63f5 100644 --- a/spec/classes/neutron_db_spec.rb +++ b/spec/classes/neutron_db_spec.rb @@ -7,7 +7,6 @@ describe 'neutron::db' do :db_max_retries => '', :connection => 'sqlite:////var/lib/neutron/ovs.sqlite', :connection_recycle_time => '', - :min_pool_size => '', :max_pool_size => '', :max_retries => '', :retry_interval => '', @@ -21,7 +20,6 @@ describe 'neutron::db' do { :database_connection => 'mysql+pymysql://neutron:neutron@localhost/neutron', :database_connection_recycle_time => '3601', - :database_min_pool_size => '2', :database_max_pool_size => '11', :database_max_retries => '11', :database_retry_interval => '11', @@ -35,7 +33,6 @@ describe 'neutron::db' do :db_max_retries => '-1', :connection => 'mysql+pymysql://neutron:neutron@localhost/neutron', :connection_recycle_time => '3601', - :min_pool_size => '2', :max_pool_size => '11', :max_retries => '11', :retry_interval => '11', diff --git a/spec/classes/neutron_server_spec.rb b/spec/classes/neutron_server_spec.rb index 1be5325fe..75d21353d 100644 --- a/spec/classes/neutron_server_spec.rb +++ b/spec/classes/neutron_server_spec.rb @@ -21,7 +21,6 @@ describe 'neutron::server' do :database_max_retries => 10, :database_idle_timeout => 3600, :database_retry_interval => 10, - :database_min_pool_size => 1, :database_max_pool_size => 10, :database_max_overflow => 20, :sync_db => false,