Browse Source

Deprecate min_pool_size option

min_pool_size option is not used,see:

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

Change-Id: I1753b530a72add191a99e621e422c98cdecda874
Closes-Bug: #1868511
tags/16.2.0
ZhongShengping 4 months ago
parent
commit
487da2574e
4 changed files with 21 additions and 15 deletions
  1. +12
    -7
      manifests/db.pp
  2. +5
    -5
      manifests/init.pp
  3. +4
    -0
      releasenotes/notes/deprecate_database_min_pool_size-option-92a6142ee11ae0f9.yaml
  4. +0
    -3
      spec/classes/keystone_db_spec.rb

+ 12
- 7
manifests/db.pp View File

@@ -26,10 +26,6 @@
# Interval between retries of opening a database connection.
# (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,26 +38,36 @@
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# 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 keystone::db (
$database_db_max_retries = $::os_service_default,
$database_connection = 'sqlite:////var/lib/keystone/keystone.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,
# DEPRECATED PARAMETERS
$database_min_pool_size = undef,
) {

include keystone::deps

if $::keystone::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 keystone::<myparam> if keystone::db::<myparam> isn't specified.
$database_connection_real = pick($::keystone::database_connection, $database_connection)
$database_connection_recycle_time_real = pick($::keystone::database_idle_timeout,
$database_connection_recycle_time)
$database_min_pool_size_real = pick($::keystone::database_min_pool_size, $database_min_pool_size)
$database_max_pool_size_real = pick($::keystone::database_max_pool_size, $database_max_pool_size)
$database_max_retries_real = pick($::keystone::database_max_retries, $database_max_retries)
$database_retry_interval_real = pick($::keystone::database_retry_interval, $database_retry_interval)
@@ -74,7 +80,6 @@ class keystone::db (
db_max_retries => $database_db_max_retries,
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,


+ 5
- 5
manifests/init.pp View File

@@ -133,10 +133,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
@@ -564,6 +560,10 @@
# user by running 'keystone-manage bootstrap'.
# Defaults to undef
#
# [*database_min_pool_size*]
# (Optional) Minimum number of SQL connections to keep open in a pool.
# Defaults to: undef
#
# == Authors
#
# Dan Bode dan@puppetlabs.com
@@ -609,7 +609,6 @@ class keystone(
$database_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,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
@@ -677,6 +676,7 @@ class keystone(
$admin_token = undef,
$admin_password = undef,
$enable_bootstrap = undef,
$database_min_pool_size = undef,
) inherits keystone::params {

include keystone::deps


+ 4
- 0
releasenotes/notes/deprecate_database_min_pool_size-option-92a6142ee11ae0f9.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/keystone_db_spec.rb View File

@@ -9,7 +9,6 @@ describe 'keystone::db' do
:db_max_retries => '<SERVICE DEFAULT>',
:connection => 'sqlite:////var/lib/keystone/keystone.sqlite',
:connection_recycle_time => '<SERVICE DEFAULT>',
:min_pool_size => '<SERVICE DEFAULT>',
:max_pool_size => '<SERVICE DEFAULT>',
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
@@ -24,7 +23,6 @@ describe 'keystone::db' do
:database_db_max_retries => '-1',
:database_connection => 'mysql+pymysql://keystone:keystone@localhost/keystone',
: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 'keystone::db' do
:db_max_retries => '-1',
:connection => 'mysql+pymysql://keystone:keystone@localhost/keystone',
:connection_recycle_time => '3601',
:min_pool_size => '2',
:max_pool_size => '21',
:max_retries => '11',
:retry_interval => '11',


Loading…
Cancel
Save