openstack/devstack
Code Issues Proposed changes

Fix Swift rsync/replication configuration

Browse Source 
Swift rsync and replication services are up and running, however they
fail to replicate any data if needed and if used with more than one
replica.

This patch removes a deprecated option setting[1] and replaces it with
the required setting to use the correct rsync module suffix.

Additionally it removes an outdated subdirectory suffix in the rsyncd
configuration that has been removed as well[2].

Closes-Bug: #2100272

[1] 675145ef4a
[2] 0e58d22897

Change-Id: I5283405d00883a4dd11b7c001b1bba3776e576b8
This commit is contained in:
Christian Schwede
2025-02-26 11:40:10 +01:00
parent a08a53de42
commit 4ed29f8591
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
files/swift/rsyncd.conf
View File

@@ -6,74 +6,74 @@ address = 127.0.0.1
[account6612]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6612.lock
[account6622]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6622.lock
[account6632]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6632.lock
[account6642]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/account6642.lock
[container6611]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6611.lock
[container6621]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6621.lock
[container6631]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6631.lock
[container6641]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/container6641.lock
[object6613]
max connections = 25
path = %SWIFT_DATA_DIR%/1/node/
path = %SWIFT_DATA_DIR%/1/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6613.lock
[object6623]
max connections = 25
path = %SWIFT_DATA_DIR%/2/node/
path = %SWIFT_DATA_DIR%/2/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6623.lock
[object6633]
max connections = 25
path = %SWIFT_DATA_DIR%/3/node/
path = %SWIFT_DATA_DIR%/3/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6633.lock
[object6643]
max connections = 25
path = %SWIFT_DATA_DIR%/4/node/
path = %SWIFT_DATA_DIR%/4/
read only = false
lock file = %SWIFT_DATA_DIR%/run/object6643.lock

4
lib/swift
View File

@@ -318,8 +318,8 @@ function generate_swift_config_services {
iniuncomment ${swift_node_config} DEFAULT mount_check
iniset ${swift_node_config} DEFAULT mount_check false
iniuncomment ${swift_node_config} ${server_type}-replicator vm_test_mode
iniset ${swift_node_config} ${server_type}-replicator vm_test_mode yes
iniuncomment ${swift_node_config} ${server_type}-replicator rsync_module
iniset ${swift_node_config} ${server_type}-replicator rsync_module "{replication_ip}::${server_type}{replication_port}"
# Using a sed and not iniset/iniuncomment because we want to a global
# modification and make sure it works for new sections.