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: I9118a6d4e1553ee0715f3fda72d625ccdcdf1b0f
Closes-Bug: #1904962
This commit is contained in:
ZhongShengping 2020-11-23 09:27:52 +08:00
parent 6461caac90
commit c16009b55b
3 changed files with 15 additions and 3 deletions

View File

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

View File

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

View File

@ -14,6 +14,7 @@ describe 'heat::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[heat::install::end]',
'Anchor[heat::config::end]',
@ -23,10 +24,11 @@ describe 'heat::db::sync' do
)
end
describe 'overriding extra_params' do
describe 'overriding params' do
let :params do
{
:extra_params => '--config-file /etc/heat/heat01.conf',
:extra_params => '--config-file /etc/heat/heat01.conf',
:db_sync_timeout => 750,
}
end
@ -38,6 +40,7 @@ describe 'heat::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[heat::install::end]',
'Anchor[heat::config::end]',