openstack
/
puppet-swift
Code Issues Proposed changes

Merge "updater/reaper: Support interval option"

This commit is contained in:
Zuul 2024-01-22 17:20:01 +00:00 committed by Gerrit Code Review
parent 73a672887b 1218a17d9b
commit 526258d596
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/storage/server.pp
View File

@ -112,10 +112,18 @@
# (optional) Number of updater workers to spawn.
# Defaults to 1.
#
# [*updater_interval*]
# (optional) Minimum time for a pass to take, in seconds.
# Default to $facts['os_service_default'].
#
# [*reaper_concurrency*]
# (optional) Number of reaper workers to spawn.
# Defaults to 1.
#
# [*reaper_interval*]
# (optional) Minimum time for a pass to take, in seconds.
# Default to $facts['os_service_default'].
#
# [*log_facility*]
# (optional) Syslog log facility.
# Defaults to 'LOG_LOCAL2'.
@ -256,7 +264,9 @@ define swift::storage::server(
$replicator_concurrency = 1,
$replicator_interval = $facts['os_service_default'],
$updater_concurrency = 1,
$updater_interval = $facts['os_service_default'],
$reaper_concurrency = 1,
$reaper_interval = $facts['os_service_default'],
$log_facility = 'LOG_LOCAL2',
$log_level = 'INFO',
$log_address = '/dev/log',
@ -433,6 +443,7 @@ define swift::storage::server(
# account-reaper
'account-reaper/' => {'ensure' => present},
'account-reaper/concurrency' => {'value' => $reaper_concurrency},
'account-reaper/interval' => {'value' => $reaper_interval},
}
}
'container': {
@ -446,6 +457,7 @@ define swift::storage::server(
# container-updater
'container-updater/' => {'ensure' => present},
'container-updater/concurrency' => {'value' => $updater_concurrency},
'container-updater/interval' => {'value' => $updater_interval},
# container-sync
'container-sync/' => {'ensure' => present},
# container-sharder
@ -473,6 +485,7 @@ define swift::storage::server(
# object-updater
'object-updater/' => {'ensure' => present},
'object-updater/concurrency' => {'value' => $updater_concurrency},
'object-updater/interval' => {'value' => $updater_interval},
# object-reconstructor
'object-reconstructor/' => {'ensure' => present},
}

8
releasenotes/notes/updater-reaper-interval-23f30950cf7cdd19.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
The ``swift::storage::servce`` defined resource type now supports
the following parameters.
- ``updater_interval`` used by container-updater and object-updater
- ``reaper_interval`` used by account-reaper

3
spec/defines/swift_storage_server_spec.rb
View File

@ -94,6 +94,7 @@ describe 'swift::storage::server' do
is_expected.to contain_swift_account_config('account-replicator/interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_account_config('account-reaper/').with_ensure('present')
is_expected.to contain_swift_account_config('account-reaper/concurrency').with_value(1)
is_expected.to contain_swift_account_config('account-reaper/interval').with_value('<SERVICE DEFAULT>')
}
context 'with customized pipeline' do
@ -245,6 +246,7 @@ describe 'swift::storage::server' do
is_expected.to contain_swift_container_config('container-replicator/interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_config('container-updater/').with_ensure('present')
is_expected.to contain_swift_container_config('container-updater/concurrency').with_value(1)
is_expected.to contain_swift_container_config('container-updater/interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_config('container-sharder/').with_ensure('present')
is_expected.to contain_swift_container_config('container-sharder/auto_shard').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_container_config('container-sharder/concurrency').with_value('<SERVICE DEFAULT>')
@ -408,6 +410,7 @@ describe 'swift::storage::server' do
is_expected.to contain_swift_object_config('object-replicator/rsync_bwlimit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_object_config('object-updater/').with_ensure('present')
is_expected.to contain_swift_object_config('object-updater/concurrency').with_value(1)
is_expected.to contain_swift_object_config('object-updater/interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_swift_object_config('object-reconstructor/').with_ensure('present')
}