Add pool_timeout option
Add pool_timeout option to configure this value for pool_timeout with SQLAlchemy. Change-Id: I79e95919788ac9fc74e99cb53395725087dcb57b Closes-Bug: #1757581
This commit is contained in:
parent
8c8f5ba67a
commit
ec780033ae
|
@ -38,6 +38,10 @@
|
||||||
# (Optional) If set, use this value for max_overflow with sqlalchemy.
|
# (Optional) If set, use this value for max_overflow with sqlalchemy.
|
||||||
# Defaults to $::os_service_default
|
# Defaults to $::os_service_default
|
||||||
#
|
#
|
||||||
|
# [*database_pool_timeout*]
|
||||||
|
# (Optional) If set, use this value for pool_timeout with SQLAlchemy.
|
||||||
|
# Defaults to $::os_service_default
|
||||||
|
#
|
||||||
class glare::db (
|
class glare::db (
|
||||||
$database_connection = 'sqlite:////var/lib/glare/glare.sqlite',
|
$database_connection = 'sqlite:////var/lib/glare/glare.sqlite',
|
||||||
$database_idle_timeout = $::os_service_default,
|
$database_idle_timeout = $::os_service_default,
|
||||||
|
@ -47,6 +51,7 @@ class glare::db (
|
||||||
$database_max_retries = $::os_service_default,
|
$database_max_retries = $::os_service_default,
|
||||||
$database_retry_interval = $::os_service_default,
|
$database_retry_interval = $::os_service_default,
|
||||||
$database_max_overflow = $::os_service_default,
|
$database_max_overflow = $::os_service_default,
|
||||||
|
$database_pool_timeout = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::glare::deps
|
include ::glare::deps
|
||||||
|
@ -63,5 +68,6 @@ class glare::db (
|
||||||
retry_interval => $database_retry_interval,
|
retry_interval => $database_retry_interval,
|
||||||
max_pool_size => $database_max_pool_size,
|
max_pool_size => $database_max_pool_size,
|
||||||
max_overflow => $database_max_overflow,
|
max_overflow => $database_max_overflow,
|
||||||
|
pool_timeout => $database_pool_timeout,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds the pool_timeout option for configuring oslo.db. This will
|
||||||
|
configure this value for pool_timeout with SQLAlchemy.
|
|
@ -13,6 +13,7 @@ describe 'glare::db' do
|
||||||
:max_retries => '<SERVICE DEFAULT>',
|
:max_retries => '<SERVICE DEFAULT>',
|
||||||
:retry_interval => '<SERVICE DEFAULT>',
|
:retry_interval => '<SERVICE DEFAULT>',
|
||||||
:max_overflow => '<SERVICE DEFAULT>',
|
:max_overflow => '<SERVICE DEFAULT>',
|
||||||
|
:pool_timeout => '<SERVICE DEFAULT>',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -26,6 +27,7 @@ describe 'glare::db' do
|
||||||
:database_retry_interval => '11',
|
:database_retry_interval => '11',
|
||||||
:database_max_pool_size => '11',
|
:database_max_pool_size => '11',
|
||||||
:database_max_overflow => '21',
|
:database_max_overflow => '21',
|
||||||
|
:database_pool_timeout => '21',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -38,6 +40,7 @@ describe 'glare::db' do
|
||||||
:max_retries => '11',
|
:max_retries => '11',
|
||||||
:retry_interval => '11',
|
:retry_interval => '11',
|
||||||
:max_overflow => '21',
|
:max_overflow => '21',
|
||||||
|
:pool_timeout => '21',
|
||||||
)}
|
)}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue