Browse Source

Deprecate min_pool_size option

min_pool_size option is not used,see:

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

Change-Id: I1db44b860fd1f847c90f44583e876b4f8c5b1caa
Closes-Bug: #1868511
tags/16.2.0
ZhongShengping 6 months ago
parent
commit
8937cb5f83
4 changed files with 24 additions and 15 deletions
  1. +12
    -7
      manifests/db.pp
  2. +8
    -5
      manifests/init.pp
  3. +4
    -0
      releasenotes/notes/deprecate_database_min_pool_size-option-a8a1e54331198674.yaml
  4. +0
    -3
      spec/classes/manila_db_spec.rb

+ 12
- 7
manifests/db.pp View File

@@ -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 manila::db (
$database_connection = 'sqlite:////var/lib/manila/manila.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 manila::deps

if $::manila::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 manila::<myparam> if manila::db::<myparam> isn't specified.
$database_connection_real = pick($::manila::sql_connection, $database_connection)
$database_connection_recycle_time_real = pick($::manila::sql_idle_timeout, $database_connection_recycle_time)
$database_min_pool_size_real = pick($::manila::database_min_pool_size, $database_min_pool_size)
$database_max_pool_size_real = pick($::manila::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::manila::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::manila::database_retry_interval, $database_retry_interval)
@@ -72,7 +78,6 @@ class manila::db (
oslo::db { 'manila_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,


+ 8
- 5
manifests/init.pp View File

@@ -14,10 +14,6 @@
# (optional) Interval between retries of opening a database connection.
# (Defaults to undef)
#
# [*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.
@@ -220,12 +216,17 @@
# will be run through a green thread.
# 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 manila (
$sql_connection = undef,
$sql_idle_timeout = undef,
$database_max_retries = undef,
$database_retry_interval = undef,
$database_min_pool_size = undef,
$database_max_pool_size = undef,
$database_max_overflow = undef,
$default_transport_url = $::os_service_default,
@@ -271,6 +272,8 @@ class manila (
$amqp_password = $::os_service_default,
$purge_config = false,
$host = $::os_service_default,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {

include manila::deps


+ 4
- 0
releasenotes/notes/deprecate_database_min_pool_size-option-a8a1e54331198674.yaml View File

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

+ 0
- 3
spec/classes/manila_db_spec.rb View File

@@ -9,7 +9,6 @@ describe 'manila::db' do
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/manila/manila.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 'manila::db' do
{
:database_connection => 'mysql+pymysql://manila:manila@localhost/manila',
:database_connection_recycle_time => '3601',
:database_min_pool_size => '2',
:database_max_pool_size => '21',
:database_max_retries => '11',
:database_max_overflow => '21',
@@ -39,7 +37,6 @@ describe 'manila::db' do
:db_max_retries => '-1',
:connection => 'mysql+pymysql://manila:manila@localhost/manila',
:connection_recycle_time => '3601',
:min_pool_size => '2',
:max_pool_size => '21',
:max_retries => '11',
:retry_interval => '11',


Loading…
Cancel
Save