Merge "Add pool_timeout option"

This commit is contained in:
Zuul 2018-03-25 04:11:16 +00:00 committed by Gerrit Code Review
commit f1f1431069
3 changed files with 14 additions and 0 deletions

View File

@ -33,6 +33,10 @@
# If set, use this value for max_overflow with sqlalchemy.
# (Optional) Defaults to $::os_service_default.
#
# [*database_pool_timeout*]
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
# Defaults to $::os_service_default
#
# [*database_db_max_retries*]
# (Optional) Maximum retries in case of connection error or deadlock error
# before error is raised. Set to -1 to specify an infinite retry count.
@ -50,6 +54,7 @@ class heat::db (
$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,
$sync_db = true,
) {
@ -78,6 +83,7 @@ class heat::db (
max_retries => $database_max_retries_real,
retry_interval => $database_retry_interval_real,
max_overflow => $database_max_overflow_real,
pool_timeout => $database_pool_timeout,
db_max_retries => $database_db_max_retries,
}

View File

@ -0,0 +1,5 @@
---
features:
- |
Adds the pool_timeout option for configuring oslo.db. This will
configure this value for pool_timeout with SQLAlchemy.

View File

@ -16,6 +16,7 @@ describe 'heat::db' do
:max_retries => '<SERVICE DEFAULT>',
:retry_interval => '<SERVICE DEFAULT>',
:max_overflow => '<SERVICE DEFAULT>',
:pool_timeout => '<SERVICE DEFAULT>',
)}
end
@ -30,6 +31,7 @@ describe 'heat::db' do
:database_retry_interval => '11',
:database_db_max_retries => '-1',
:database_max_overflow => '21',
:database_pool_timeout => '21',
:sync_db => false }
end
@ -43,6 +45,7 @@ describe 'heat::db' do
:max_retries => '11',
:retry_interval => '11',
:max_overflow => '21',
:pool_timeout => '21',
)}
end