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: I4309f2e1a3c17249ca013e7bd39ed0c0b67e31f4 Closes-Bug: #1904962
This commit is contained in:
@@ -10,9 +10,14 @@
|
||||
# to the gnocchi-db-sync command.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*db_sync_timeout*]
|
||||
# (Optional) Timeout for the execution of the db_sync
|
||||
# Defaults to 300
|
||||
#
|
||||
class gnocchi::db::sync (
|
||||
$user = 'gnocchi',
|
||||
$extra_opts = undef,
|
||||
$user = 'gnocchi',
|
||||
$extra_opts = undef,
|
||||
$db_sync_timeout = 300,
|
||||
){
|
||||
|
||||
include gnocchi::deps
|
||||
@@ -24,6 +29,7 @@ class gnocchi::db::sync (
|
||||
user => $user,
|
||||
try_sleep => 5,
|
||||
tries => 10,
|
||||
timeout => $db_sync_timeout,
|
||||
logoutput => on_failure,
|
||||
subscribe => [
|
||||
Anchor['gnocchi::install::end'],
|
||||
|
@@ -0,0 +1,3 @@
|
||||
---
|
||||
features:
|
||||
- Adds db_sync_timeout parameter to db sync.
|
@@ -14,6 +14,7 @@ describe 'gnocchi::db::sync' do
|
||||
:refreshonly => 'true',
|
||||
:try_sleep => 5,
|
||||
:tries => 10,
|
||||
:timeout => 300,
|
||||
:logoutput => 'on_failure',
|
||||
:subscribe => ['Anchor[gnocchi::install::end]',
|
||||
'Anchor[gnocchi::config::end]',
|
||||
@@ -22,10 +23,11 @@ describe 'gnocchi::db::sync' do
|
||||
:tag => 'openstack-db',
|
||||
)
|
||||
end
|
||||
describe "overriding extra_opts" do
|
||||
describe "overriding params" do
|
||||
let :params do
|
||||
{
|
||||
:extra_opts => '--skip-storage',
|
||||
:extra_opts => '--skip-storage',
|
||||
:db_sync_timeout => 750,
|
||||
}
|
||||
end
|
||||
it { is_expected.to contain_exec('gnocchi-db-sync').with(
|
||||
@@ -35,6 +37,7 @@ describe 'gnocchi::db::sync' do
|
||||
:refreshonly => 'true',
|
||||
:try_sleep => 5,
|
||||
:tries => 10,
|
||||
:timeout => 750,
|
||||
:logoutput => 'on_failure',
|
||||
:subscribe => ['Anchor[gnocchi::install::end]',
|
||||
'Anchor[gnocchi::config::end]',
|
||||
|
Reference in New Issue
Block a user