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: I9abb1ed8ea8bdfc4bc4157ff47e86613077a9bd7
Closes-Bug: #1904962
This commit is contained in:
ZhongShengping 2020-11-23 09:27:52 +08:00
parent c610a97028
commit 0d0db77050
3 changed files with 17 additions and 5 deletions

View File

@ -16,10 +16,15 @@
# (Optional) The path to use for finding the magnum-db-manage binary.
# Defaults to '/usr/bin'
#
# [*db_sync_timeout*]
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class magnum::db::sync(
$user = 'magnum',
$extra_params = '--config-file /etc/magnum/magnum.conf',
$exec_path = '/usr/bin',
$user = 'magnum',
$extra_params = '--config-file /etc/magnum/magnum.conf',
$exec_path = '/usr/bin',
$db_sync_timeout = 300,
) {
include magnum::deps
@ -31,6 +36,7 @@ class magnum::db::sync(
refreshonly => true,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
logoutput => on_failure,
subscribe => [
Anchor['magnum::install::end'],

View File

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

View File

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