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: Ia14ad6a2ca9c200867ee5760ca4d72d747d27ad5
Closes-Bug: #1904962
This commit is contained in:
ZhongShengping 2020-11-23 09:27:52 +08:00
parent 5cfdef76a0
commit 75ff328e89
3 changed files with 37 additions and 1 deletions

View File

@ -5,8 +5,13 @@
# (Optional) User to run dbsync command.
# Defaults to 'aodh'
#
# [*db_sync_timeout*]
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class aodh::db::sync (
$user = 'aodh',
$user = 'aodh',
$db_sync_timeout = 300,
){
include aodh::deps
@ -18,6 +23,7 @@ class aodh::db::sync (
user => $user,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
logoutput => on_failure,
subscribe => [
Anchor['aodh::install::end'],

View File

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

View File

@ -14,6 +14,7 @@ describe 'aodh::db::sync' do
:user => 'aodh',
:try_sleep => 5,
:tries => 10,
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[aodh::install::end]',
'Anchor[aodh::config::end]',
@ -23,6 +24,32 @@ describe 'aodh::db::sync' do
)
end
describe "overriding db_sync_timeout" do
let :params do
{
:db_sync_timeout => 750,
}
end
it {
is_expected.to contain_exec('aodh-db-sync').with(
:command => 'aodh-dbsync --config-file /etc/aodh/aodh.conf',
:path => '/usr/bin',
:refreshonly => 'true',
:user => 'aodh',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[aodh::install::end]',
'Anchor[aodh::config::end]',
'Anchor[aodh::dbsync::begin]'],
:notify => 'Anchor[aodh::dbsync::end]',
:tag => 'openstack-db',
)
}
end
end
on_supported_os({