openstack/tripleo-heat-templates
Code Issues Proposed changes

Run Swift replicators in single replica mode

Browse Source 
This makes sure we still run the replicators in single replica mode.
Besides replication they also do some cleanup like removing old
tombstone files.

However, it is not needed to run them all the time, thus setting an
interval between runs of 1 day.

Closes-Bug: 1907062
Change-Id: I4dface059e193c5c0769f7d80293ff5fff7d2653
This commit is contained in:
Christian Schwede 2020-11-26 13:07:18 +01:00 committed by Giulio Fidente
parent 7a6cd0640e
commit 9be1b77461
2 changed files with 66 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -227,6 +227,12 @@ outputs:
swift::storage::cron::recon::monthday: {get_param: SwiftReconCronMonthday}
swift::storage::cron::recon::month: {get_param: SwiftReconCronMonth}
swift::storage::cron::recon::weekday: {get_param: SwiftReconCronWeekday}
-
if:
- single_replica_mode
- swift::storage::server::replicator_interval: 86400
- {}
service_config_settings: {}
# BEGIN DOCKER SETTINGS
puppet_config:
@ -397,24 +403,6 @@ outputs:
- /var/log/containers/swift:/var/log/swift:z
environment: &kolla_env
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
swift_account_replicator:
image: *swift_account_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_container_auditor:
image: &swift_container_image {get_param: ContainerSwiftContainerImage}
net: host
@ -431,25 +419,6 @@ outputs:
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_container_replicator:
image: *swift_container_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_object_auditor:
image: &swift_object_image {get_param: ContainerSwiftObjectImage}
net: host
@ -466,24 +435,6 @@ outputs:
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_object_replicator:
image: *swift_object_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_rsync:
image: *swift_object_image
net: host
@ -522,6 +473,24 @@ outputs:
- /var/cache/swift:/var/cache/swift:z
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_account_replicator:
image: *swift_account_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_account_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_account_server:
image: *swift_account_image
net: host
@ -556,6 +525,24 @@ outputs:
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_container_replicator:
image: *swift_container_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_container_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_container_server:
image: *swift_container_image
net: host
@ -606,6 +593,24 @@ outputs:
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_object_replicator:
image: *swift_object_image
net: host
user: swift
restart: always
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_object_replicator.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:ro
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env
swift_object_server:
image: *swift_object_image
net: host

6
releasenotes/notes/swift-single-replica-cleanup-fdf72b9e462185c7.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Enable Swift replicators in single replica mode to ensure cleanup of old
tombstone (.ts) files. Sleep interval between replication runs is set to 24
hours to prevent unneeded load on the systems if no replication is needed.