71f6fd025e
Currently, the rsync module where the replicators send data is static. It
forbids administrators to set rsync configuration based on their current
deployment or needs.
As an example, the rsyncd configuration example encourages to set a connections
limit for the modules account, container and object. It permits to protect
devices from excessives parallels connections, because it would impact
performances.
On a server with many devices, it is tempting to increase this number
proportionally, but nothing guarantees that the distribution of the connections
will be balanced. In the worst scenario, a single device can receive all the
connections, which is a severe impact on performances.
This commit adds a new option named 'rsync_module' to the *-replicator sections
of the *-server configuration file. This configuration variable can be
extrapolated with device attributes like ip, port, device, zone, ... by using
the format {NAME}. eg:
rsync_module = {replication_ip}::object_{device}
With this configuration, an administrators can solve the problem of connections
distribution by creating one module per device in rsyncd configuration.
The default values are backward compatible:
{replication_ip}::account
{replication_ip}::container
{replication_ip}::object
Option vm_test_mode is deprecated by this commit, but backward compatibility is
maintained. The option is only effective when rsync_module is not set. In that
case, {replication_port} is appended to the default value of rsync_module.
Change-Id: Iad91df50dadbe96c921181797799b4444323ce2e
79 lines
1.6 KiB
Plaintext
79 lines
1.6 KiB
Plaintext
uid = swift
|
|
gid = swift
|
|
log file = /var/log/rsyncd.log
|
|
pid file = /var/run/rsyncd.pid
|
|
|
|
[account]
|
|
max connections = 2
|
|
path = /srv/node
|
|
read only = false
|
|
lock file = /var/lock/account.lock
|
|
|
|
[container]
|
|
max connections = 4
|
|
path = /srv/node
|
|
read only = false
|
|
lock file = /var/lock/container.lock
|
|
|
|
[object]
|
|
max connections = 8
|
|
path = /srv/node
|
|
read only = false
|
|
lock file = /var/lock/object.lock
|
|
|
|
|
|
# If rsync_module includes the device, you can tune rsyncd to permit 4
|
|
# connections per device instead of simply allowing 8 connections for all
|
|
# devices:
|
|
# rsync_module = {replication_ip}::object_{device}
|
|
#
|
|
# (if devices in your object ring are named sda, sdb and sdc)
|
|
#
|
|
#[object_sda]
|
|
#max connections = 4
|
|
#path = /srv/node
|
|
#read only = false
|
|
#lock file = /var/lock/object_sda.lock
|
|
#
|
|
#[object_sdb]
|
|
#max connections = 4
|
|
#path = /srv/node
|
|
#read only = false
|
|
#lock file = /var/lock/object_sdb.lock
|
|
#
|
|
#[object_sdc]
|
|
#max connections = 4
|
|
#path = /srv/node
|
|
#read only = false
|
|
#lock file = /var/lock/object_sdc.lock
|
|
|
|
|
|
# To emulate the deprecated option vm_test_mode = yes, set:
|
|
# rsync_module = {replication_ip}::object{replication_port}
|
|
#
|
|
# So, on your SAIO, you have to set the following rsyncd configuration:
|
|
#
|
|
#[object6010]
|
|
#max connections = 25
|
|
#path = /srv/1/node/
|
|
#read only = false
|
|
#lock file = /var/lock/object6010.lock
|
|
#
|
|
#[object6020]
|
|
#max connections = 25
|
|
#path = /srv/2/node/
|
|
#read only = false
|
|
#lock file = /var/lock/object6020.lock
|
|
#
|
|
#[object6030]
|
|
#max connections = 25
|
|
#path = /srv/3/node/
|
|
#read only = false
|
|
#lock file = /var/lock/object6030.lock
|
|
#
|
|
#[object6040]
|
|
#max connections = 25
|
|
#path = /srv/4/node/
|
|
#read only = false
|
|
#lock file = /var/lock/object6040.lock
|