openstack/puppet-swift
Code Issues Proposed changes

Add missing Swift object reconstructor service

Browse Source 
Adding the object-reconstructor service and enabling it by default.
This is required for erasure coding.

Change-Id: If388bcc1532d7db2132d4b206e13252a30fa9041
This commit is contained in:
Christian Schwede
2017-03-15 15:53:46 +01:00
parent 4955428bf0
commit af6fb24845
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@@ -16,6 +16,7 @@ class swift::params {
$object_package_name = 'swift-object' $object_package_name = 'swift-object'
$object_server_service_name = 'swift-object' $object_server_service_name = 'swift-object'
$object_auditor_service_name = 'swift-object-auditor' $object_auditor_service_name = 'swift-object-auditor'
$object_reconstructor_service_name = 'swift-object-reconstructor'
$object_replicator_service_name = 'swift-object-replicator' $object_replicator_service_name = 'swift-object-replicator'
$object_updater_service_name = 'swift-object-updater' $object_updater_service_name = 'swift-object-updater'
$object_expirer_package_name = 'swift-object-expirer' $object_expirer_package_name = 'swift-object-expirer'
@@ -41,6 +42,7 @@ class swift::params {
$object_package_name = 'openstack-swift-object' $object_package_name = 'openstack-swift-object'
$object_server_service_name = 'openstack-swift-object' $object_server_service_name = 'openstack-swift-object'
$object_auditor_service_name = 'openstack-swift-object-auditor' $object_auditor_service_name = 'openstack-swift-object-auditor'
$object_reconstructor_service_name = 'openstack-swift-object-reconstructor'
$object_replicator_service_name = 'openstack-swift-object-replicator' $object_replicator_service_name = 'openstack-swift-object-replicator'
$object_updater_service_name = 'openstack-swift-object-updater' $object_updater_service_name = 'openstack-swift-object-updater'
$object_expirer_package_name = 'openstack-swift-proxy' $object_expirer_package_name = 'openstack-swift-proxy'
@@ -67,6 +69,7 @@ class swift::params {
'swift-proxy-server', 'swift-proxy-server',
'swift-object-auditor', 'swift-object-auditor',
'swift-object-expirer', 'swift-object-expirer',
'swift-object-reconstructor',
'swift-object-replicator', 'swift-object-replicator',
'swift-object-server', 'swift-object-server',
'swift-object-updater', 'swift-object-updater',

12
manifests/storage/object.pp
View File

@@ -36,6 +36,7 @@ class swift::storage::object(
include ::swift::deps include ::swift::deps
Swift_config<| |> ~> Service['swift-object-updater'] Swift_config<| |> ~> Service['swift-object-updater']
Swift_config<| |> ~> Service['swift-object-reconstructor']
swift::storage::generic { 'object': swift::storage::generic { 'object':
manage_service => $manage_service, manage_service => $manage_service,
@@ -62,4 +63,15 @@ class swift::storage::object(
require => Package['swift-object'], require => Package['swift-object'],
service_subscribe => Concat["/etc/swift/${config_file_name}"], service_subscribe => Concat["/etc/swift/${config_file_name}"],
} }
swift::service { 'swift-object-reconstructor':
os_family_service_name => $::swift::params::object_reconstructor_service_name,
service_ensure => $service_ensure,
enabled => $enabled,
config_file_name => $config_file_name,
service_provider => $service_provider,
require => Package['swift-object'],
service_subscribe => Concat["/etc/swift/${config_file_name}"],
}
} }

4
releasenotes/notes/swift-add-reconstructor-service-25dd7df5a7d25612.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
fixes:
- Added the object-reconstructor service and enabled it by default.
This is required for erasure coding.

36
spec/classes/swift_storage_object_spec.rb
View File

@@ -78,10 +78,11 @@ describe 'swift::storage::object' do
let :platform_params do let :platform_params do
{ :service_names => { { :service_names => {
'swift-object-server' => 'swift-object', 'swift-object-server' => 'swift-object',
'swift-object-replicator' => 'swift-object-replicator', 'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-updater' => 'swift-object-updater', 'swift-object-replicator' => 'swift-object-replicator',
'swift-object-auditor' => 'swift-object-auditor' 'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor'
}, },
:service_provider => nil :service_provider => nil
} }
@@ -96,10 +97,11 @@ describe 'swift::storage::object' do
let :platform_params do let :platform_params do
{ :service_names => { { :service_names => {
'swift-object-server' => 'swift-object-server', 'swift-object-server' => 'swift-object-server',
'swift-object-replicator' => 'swift-object-replicator', 'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-updater' => 'swift-object-updater', 'swift-object-replicator' => 'swift-object-replicator',
'swift-object-auditor' => 'swift-object-auditor', 'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
}, },
:service_provider => 'swiftinit' :service_provider => 'swiftinit'
} }
@@ -121,10 +123,11 @@ describe 'swift::storage::object' do
let :platform_params do let :platform_params do
{ :service_names => { { :service_names => {
'swift-object-server' => 'openstack-swift-object', 'swift-object-server' => 'openstack-swift-object',
'swift-object-replicator' => 'openstack-swift-object-replicator', 'swift-object-reconstructor' => 'openstack-swift-object-reconstructor',
'swift-object-updater' => 'openstack-swift-object-updater', 'swift-object-replicator' => 'openstack-swift-object-replicator',
'swift-object-auditor' => 'openstack-swift-object-auditor' 'swift-object-updater' => 'openstack-swift-object-updater',
'swift-object-auditor' => 'openstack-swift-object-auditor'
} }
} }
end end
@@ -138,10 +141,11 @@ describe 'swift::storage::object' do
let :platform_params do let :platform_params do
{ :service_names => { { :service_names => {
'swift-object-server' => 'swift-object-server', 'swift-object-server' => 'swift-object-server',
'swift-object-replicator' => 'swift-object-replicator', 'swift-object-reconstructor' => 'swift-object-reconstructor',
'swift-object-updater' => 'swift-object-updater', 'swift-object-replicator' => 'swift-object-replicator',
'swift-object-auditor' => 'swift-object-auditor', 'swift-object-updater' => 'swift-object-updater',
'swift-object-auditor' => 'swift-object-auditor',
}, },
:service_provider => 'swiftinit' :service_provider => 'swiftinit'
} }

2
templates/object-server.conf.erb
View File

@@ -42,3 +42,5 @@ concurrency = <%= @replicator_concurrency %>
concurrency = <%= @updater_concurrency %> concurrency = <%= @updater_concurrency %>
[object-auditor] [object-auditor]
[object-reconstructor]