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: Ib8c2242c76106ecb41c267fe75f8f824e2934cc1
Closes-Bug: #1904962
This commit is contained in:
ZhongShengping 2020-11-23 09:27:52 +08:00
parent 1e0ffe6f10
commit da173ebd0b
3 changed files with 16 additions and 1 deletions

View File

@ -1,7 +1,15 @@
#
# Class to execute "mistral-db-manage 'upgrade head' and 'populate'"
#
class mistral::db::sync {
# ==Parameters
#
# [*db_sync_timeout*]
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class mistral::db::sync(
$db_sync_timeout = 300,
) {
include mistral::deps
include mistral::params
@ -14,6 +22,7 @@ class mistral::db::sync {
refreshonly => true,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
subscribe => [
Anchor['mistral::install::end'],
Anchor['mistral::config::end'],
@ -28,6 +37,7 @@ class mistral::db::sync {
command => $::mistral::params::db_populate_command,
path => '/usr/bin',
user => 'mistral',
timeout => $db_sync_timeout,
logoutput => on_failure,
refreshonly => true,
subscribe => [

View File

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

View File

@ -15,6 +15,7 @@ describe 'mistral::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[mistral::install::end]',
'Anchor[mistral::config::end]',
@ -28,6 +29,7 @@ describe 'mistral::db::sync' do
:path => '/usr/bin',
:user => 'mistral',
:refreshonly => 'true',
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[mistral::install::end]',
'Anchor[mistral::config::end]',