Configure rsyncd without pid file for Swift
There are known issues with stale pid file handling in rsyncd [1], which by consequence cause Swift to not start. This change disables use of pid file completely when deployed by the swift-storage conainer and depends on the addition of such a feature in the puppetlabs-rsync module [2] 1. https://www.mail-archive.com/rsync@lists.samba.org/msg32735.html 2. https://github.com/puppetlabs/puppetlabs-rsync/pull/120 Closes-Bug: 1896605 Change-Id: I81ad92793b8f115c046a678f4b2cc51d1014e3b6
This commit is contained in:
parent
85100b8bfc
commit
43b5b0875d
@ -163,6 +163,7 @@ outputs:
|
|||||||
"%{hiera('$NETWORK')}"
|
"%{hiera('$NETWORK')}"
|
||||||
params:
|
params:
|
||||||
$NETWORK: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
|
$NETWORK: {get_param: [ServiceNetMap, SwiftStorageNetwork]}
|
||||||
|
rsync::server::pid_file: 'UNSET'
|
||||||
-
|
-
|
||||||
if:
|
if:
|
||||||
- account_workers_zero
|
- account_workers_zero
|
||||||
@ -312,15 +313,6 @@ outputs:
|
|||||||
command: ['chown', '-R', 'swift:', '/srv/node']
|
command: ['chown', '-R', 'swift:', '/srv/node']
|
||||||
volumes:
|
volumes:
|
||||||
- /srv/node:/srv/node:z
|
- /srv/node:/srv/node:z
|
||||||
# FIXME (cschwede): remove this once the pid file setting is disabled
|
|
||||||
swift_rsync_fix:
|
|
||||||
image: {get_param: ContainerSwiftObjectImage}
|
|
||||||
net: host
|
|
||||||
user: root
|
|
||||||
detach: false
|
|
||||||
command: ['/bin/bash', '-c', 'sed -i "/pid file/d" /var/lib/kolla/config_files/src/etc/rsyncd.conf']
|
|
||||||
volumes:
|
|
||||||
- /var/lib/config-data/puppet-generated/swift:/var/lib/kolla/config_files/src:rw,z
|
|
||||||
step_4:
|
step_4:
|
||||||
map_merge:
|
map_merge:
|
||||||
- if:
|
- if:
|
||||||
@ -666,10 +658,6 @@ outputs:
|
|||||||
- swift_rsyslog_config.status is defined
|
- swift_rsyslog_config.status is defined
|
||||||
- swift_rsyslog_config.status.ActiveState == 'active'
|
- swift_rsyslog_config.status.ActiveState == 'active'
|
||||||
update_tasks:
|
update_tasks:
|
||||||
- name: Ensure rsyncd pid file is absent
|
|
||||||
file:
|
|
||||||
path: /run/rsyncd.pid
|
|
||||||
state: absent
|
|
||||||
- name: Check swift containers log folder/symlink exists
|
- name: Check swift containers log folder/symlink exists
|
||||||
stat:
|
stat:
|
||||||
path: /var/log/containers/swift
|
path: /var/log/containers/swift
|
||||||
|
Loading…
Reference in New Issue
Block a user