Browse Source

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: I1c0896d9b729fe0d2aeeed02386b48fb9e6debe5
Closes-Bug: #1904962
changes/79/763679/1
ZhongShengping 2 years ago
parent
commit
e209161a6c
  1. 7
      manifests/db/sync.pp
  2. 3
      releasenotes/notes/add_db_sync_timeout-9c30cd6350a06ed9.yaml
  3. 7
      spec/classes/barbican_db_sync_spec.rb

7
manifests/db/sync.pp

@ -13,9 +13,14 @@
# to the barbican-db-manage command.
# Defaults to undef
#
# [*db_sync_timeout*]
# (Optional) Timeout for the execution of the db_sync
# Defaults to 300
#
class barbican::db::sync(
$extra_params = undef,
$secret_store_extra_params = undef,
$db_sync_timeout = 300,
) {
include barbican::deps
@ -27,6 +32,7 @@ class barbican::db::sync(
refreshonly => true,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
logoutput => on_failure,
subscribe => [
Anchor['barbican::install::end'],
@ -44,6 +50,7 @@ class barbican::db::sync(
refreshonly => true,
try_sleep => 5,
tries => 10,
timeout => $db_sync_timeout,
logoutput => on_failure,
subscribe => [
Anchor['barbican::install::end'],

3
releasenotes/notes/add_db_sync_timeout-9c30cd6350a06ed9.yaml

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

7
spec/classes/barbican_db_sync_spec.rb

@ -15,6 +15,7 @@ describe 'barbican::db::sync' do
:try_sleep => 5,
:tries => 10,
:logoutput => 'on_failure',
:timeout => 300,
:subscribe => ['Anchor[barbican::install::end]',
'Anchor[barbican::config::end]',
'Anchor[barbican::dbsync::begin]'],
@ -28,6 +29,7 @@ describe 'barbican::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 300,
:logoutput => 'on_failure',
:subscribe => ['Anchor[barbican::install::end]',
'Anchor[barbican::config::end]',
@ -37,11 +39,12 @@ describe 'barbican::db::sync' do
)
end
describe "overriding extra_params" do
describe "overriding params" do
let :params do
{
:extra_params => '--config-file /etc/barbican/barbican.conf',
:secret_store_extra_params => '--config-file /etc/barbican/barbican.conf',
:db_sync_timeout => 750,
}
end
@ -53,6 +56,7 @@ describe 'barbican::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[barbican::install::end]',
'Anchor[barbican::config::end]',
@ -67,6 +71,7 @@ describe 'barbican::db::sync' do
:refreshonly => 'true',
:try_sleep => 5,
:tries => 10,
:timeout => 750,
:logoutput => 'on_failure',
:subscribe => ['Anchor[barbican::install::end]',
'Anchor[barbican::config::end]',

Loading…
Cancel
Save