Allow db sync timeouts to be configurable

As Openstack projects continue to have longer database migration
chains, the Puppet default timeout of 300 seconds for an execution
is becoming too short a duration on some hardware, leading to timeouts.
As projects continue to add more migration scripts without pruning
the base, timeouts will continue to become more frequent unless
this time can be expanded.

Change-Id: I02fcb369f9435c729081aa7b0d5682da83d8446d
Closes-Bug: #1904962
This commit is contained in:
ZhongShengping 2020-11-23 09:27:52 +08:00
parent 24e171b301
commit 0f2219c5ef
3 changed files with 15 additions and 3 deletions

View File

@ -9,8 +9,13 @@
# in the command line between 'cinder-manage' and 'db sync'.
# Defaults to undef
#
# [*db_sync_timeout*]
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class cinder::db::sync(
$extra_params = undef,
$extra_params = undef,
$db_sync_timeout = 300,
) {
include cinder::deps
@ -22,6 +27,7 @@ class cinder::db::sync(
refreshonly => true,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
logoutput => 'on_failure',
subscribe => [
Anchor['cinder::install::end'],

View File

@ -0,0 +1,3 @@
---
features:
- Adds db_sync_timeout parameter to db sync.

View File

@ -13,6 +13,7 @@ describe 'cinder::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[cinder::install::end]',
'Anchor[cinder::config::end]',
@ -22,10 +23,11 @@ describe 'cinder::db::sync' do
)
end
context "overriding extra_params" do
context "overriding params" do
let :params do
{
:extra_params => '--config-file /etc/cinder/cinder.conf',
:extra_params => '--config-file /etc/cinder/cinder.conf',
:db_sync_timeout => 750,
}
end
@ -37,6 +39,7 @@ describe 'cinder::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[cinder::install::end]',
'Anchor[cinder::config::end]',