Merge "Allows to configure the rsync modules where the replicators wi…

…ll send data"
OYMZeroDegree · Sep 16, 2015 · 241b68d · 241b68d
2 parents e399dcb + 71f6fd0
commit 241b68d
Show file tree

Hide file tree

Showing 27 changed files with 247 additions and 76 deletions.
diff --git a/doc/manpages/account-server.conf.5 b/doc/manpages/account-server.conf.5
@@ -176,8 +176,6 @@ Syslog log facility. The default is LOG_LOCAL0.
 Logging level. The default is INFO.
 .IP \fBlog_address\fR
 Logging address. The default is /dev/log.
-.IP \fBvm_test_mode\fR
-Indicates that you are using a VM environment. The default is no.
 .IP \fBper_diff\fR
 The default is 1000.
 .IP \fBmax_diffs\fR

diff --git a/doc/manpages/container-server.conf.5 b/doc/manpages/container-server.conf.5
@@ -182,8 +182,6 @@ Syslog log facility. The default is LOG_LOCAL0.
 Logging level. The default is INFO.
 .IP \fBlog_address\fR
 Logging address. The default is /dev/log.
-.IP \fBvm_test_mode\fR
-Indicates that you are using a VM environment. The default is no.
 .IP \fBer_diff\fR
 The default is 1000.
 .IP \fBmax_diffs\fR

diff --git a/doc/manpages/object-server.conf.5 b/doc/manpages/object-server.conf.5
@@ -185,8 +185,6 @@ Syslog log facility. The default is LOG_LOCAL0.
 Logging level. The default is INFO.
 .IP \fBlog_address\fR
 Logging address. The default is /dev/log.
-.IP \fBvm_test_mode\fR
-Indicates that you are using a VM environment. The default is no.
 .IP \fBdaemonize\fR
 Whether or not to run replication as a daemon. The default is yes.
 .IP "\fBrun_pause [deprecated]\fR"

diff --git a/doc/saio/swift/account-server/1.conf b/doc/saio/swift/account-server/1.conf
@@ -20,7 +20,7 @@ use = egg:swift#account
 use = egg:swift#recon
 
 [account-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::account{replication_port}
 
 [account-auditor]
 

diff --git a/doc/saio/swift/account-server/2.conf b/doc/saio/swift/account-server/2.conf
@@ -20,7 +20,7 @@ use = egg:swift#account
 use = egg:swift#recon
 
 [account-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::account{replication_port}
 
 [account-auditor]
 

diff --git a/doc/saio/swift/account-server/3.conf b/doc/saio/swift/account-server/3.conf
@@ -20,7 +20,7 @@ use = egg:swift#account
 use = egg:swift#recon
 
 [account-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::account{replication_port}
 
 [account-auditor]
 

diff --git a/doc/saio/swift/account-server/4.conf b/doc/saio/swift/account-server/4.conf
@@ -20,7 +20,7 @@ use = egg:swift#account
 use = egg:swift#recon
 
 [account-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::account{replication_port}
 
 [account-auditor]
 

diff --git a/doc/saio/swift/container-server/1.conf b/doc/saio/swift/container-server/1.conf
@@ -20,7 +20,7 @@ use = egg:swift#container
 use = egg:swift#recon
 
 [container-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::container{replication_port}
 
 [container-updater]
 

diff --git a/doc/saio/swift/container-server/2.conf b/doc/saio/swift/container-server/2.conf
@@ -20,7 +20,7 @@ use = egg:swift#container
 use = egg:swift#recon
 
 [container-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::container{replication_port}
 
 [container-updater]
 

diff --git a/doc/saio/swift/container-server/3.conf b/doc/saio/swift/container-server/3.conf
@@ -20,7 +20,7 @@ use = egg:swift#container
 use = egg:swift#recon
 
 [container-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::container{replication_port}
 
 [container-updater]
 

diff --git a/doc/saio/swift/container-server/4.conf b/doc/saio/swift/container-server/4.conf
@@ -20,7 +20,7 @@ use = egg:swift#container
 use = egg:swift#recon
 
 [container-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::container{replication_port}
 
 [container-updater]
 

diff --git a/doc/saio/swift/object-server/1.conf b/doc/saio/swift/object-server/1.conf
@@ -20,7 +20,7 @@ use = egg:swift#object
 use = egg:swift#recon
 
 [object-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::object{replication_port}
 
 [object-reconstructor]
 

diff --git a/doc/saio/swift/object-server/2.conf b/doc/saio/swift/object-server/2.conf
@@ -20,7 +20,7 @@ use = egg:swift#object
 use = egg:swift#recon
 
 [object-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::object{replication_port}
 
 [object-reconstructor]
 

diff --git a/doc/saio/swift/object-server/3.conf b/doc/saio/swift/object-server/3.conf
@@ -20,7 +20,7 @@ use = egg:swift#object
 use = egg:swift#recon
 
 [object-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::object{replication_port}
 
 [object-reconstructor]
 

diff --git a/doc/saio/swift/object-server/4.conf b/doc/saio/swift/object-server/4.conf
@@ -20,7 +20,7 @@ use = egg:swift#object
 use = egg:swift#recon
 
 [object-replicator]
-vm_test_mode = yes
+rsync_module = {replication_ip}::object{replication_port}
 
 [object-reconstructor]
 

diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst
@@ -594,6 +594,17 @@ node_timeout        DEFAULT or 10      Request timeout to external services.
                                        in the DEFAULT section, or 10 (though
                                        other sections use 3 as the final
                                        default).
+rsync_module        {replication_ip}::object
+                                       Format of the rsync module where the
+                                       replicator will send data. The
+                                       configuration value can include some
+                                       variables that will be extracted from
+                                       the ring. Variables must follow the
+                                       format {NAME} where NAME is one of:
+                                       ip, port, replication_ip,
+                                       replication_port, region, zone, device,
+                                       meta. See etc/rsyncd.conf-sample for
+                                       some examples.
 ==================  =================  =======================================
 
 [object-updater]
@@ -723,6 +734,18 @@ conn_timeout        0.5                   Connection timeout to external
                                           services
 reclaim_age         604800                Time elapsed in seconds before a
                                           container can be reclaimed
+rsync_module        {replication_ip}::container
+                                          Format of the rsync module where the
+                                          replicator will send data. The
+                                          configuration value can include some
+                                          variables that will be extracted from
+                                          the ring. Variables must follow the
+                                          format {NAME} where NAME is one of:
+                                          ip, port, replication_ip,
+                                          replication_port, region, zone,
+                                          device, meta. See
+                                          etc/rsyncd.conf-sample for some
+                                          examples.
 ==================  ====================  ====================================
 
 [container-updater]
@@ -850,6 +873,18 @@ node_timeout        10                  Request timeout to external services
 conn_timeout        0.5                 Connection timeout to external services
 reclaim_age         604800              Time elapsed in seconds before an
                                         account can be reclaimed
+rsync_module        {replication_ip}::account
+                                        Format of the rsync module where the
+                                        replicator will send data. The
+                                        configuration value can include some
+                                        variables that will be extracted from
+                                        the ring. Variables must follow the
+                                        format {NAME} where NAME is one of:
+                                        ip, port, replication_ip,
+                                        replication_port, region, zone,
+                                        device, meta. See
+                                        etc/rsyncd.conf-sample for some
+                                        examples.
 ==================  ==================  ======================================
 
 [account-auditor]

diff --git a/doc/source/replication_network.rst b/doc/source/replication_network.rst
@@ -146,7 +146,7 @@ For SAIO replication
 
    delete all configuration options in section [<*>-replicator]
 
-#. Add configuration files for object-server, in /etc/swift/objec-server/
+#. Add configuration files for object-server, in /etc/swift/object-server/
 
    * 5.conf::
 
@@ -170,7 +170,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [object-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::object{replication_port}
 
    * 6.conf::
 
@@ -194,7 +194,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [object-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::object{replication_port}
 
    * 7.conf::
 
@@ -218,7 +218,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [object-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::object{replication_port}
 
    * 8.conf::
 
@@ -242,7 +242,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [object-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::object{replication_port}
 
 #. Add configuration files for container-server, in /etc/swift/container-server/
 
@@ -268,7 +268,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [container-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::container{replication_port}
 
    * 6.conf::
 
@@ -292,7 +292,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [container-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::container{replication_port}
 
    * 7.conf::
 
@@ -316,7 +316,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [container-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::container{replication_port}
 
    * 8.conf::
 
@@ -340,7 +340,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [container-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::container{replication_port}
 
 #. Add configuration files for account-server, in /etc/swift/account-server/
 
@@ -366,7 +366,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [account-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::account{replication_port}
 
    * 6.conf::
 
@@ -390,7 +390,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [account-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::account{replication_port}
 
    * 7.conf::
 
@@ -414,7 +414,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [account-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::account{replication_port}
 
    * 8.conf::
 
@@ -438,7 +438,7 @@ For SAIO replication
         use = egg:swift#recon
 
         [account-replicator]
-        vm_test_mode = yes
+        rsync_module = {replication_ip}::account{replication_port}
 
 
 ---------------------------------

diff --git a/etc/account-server.conf-sample b/etc/account-server.conf-sample
@@ -90,7 +90,6 @@ use = egg:swift#recon
 # log_level = INFO
 # log_address = /dev/log
 #
-# vm_test_mode = no
 # per_diff = 1000
 # max_diffs = 100
 # concurrency = 8
@@ -111,6 +110,10 @@ use = egg:swift#recon
 # a different region than the local one.
 # rsync_compress = no
 #
+# Format of the rysnc module where the replicator will send data. See
+# etc/rsyncd.conf-sample for some usage examples.
+# rsync_module = {replication_ip}::account
+#
 # recon_cache_path = /var/cache/swift
 
 [account-auditor]

diff --git a/etc/container-server.conf-sample b/etc/container-server.conf-sample
@@ -99,7 +99,6 @@ use = egg:swift#recon
 # log_level = INFO
 # log_address = /dev/log
 #
-# vm_test_mode = no
 # per_diff = 1000
 # max_diffs = 100
 # concurrency = 8
@@ -120,6 +119,10 @@ use = egg:swift#recon
 # a different region than the local one.
 # rsync_compress = no
 #
+# Format of the rysnc module where the replicator will send data. See
+# etc/rsyncd.conf-sample for some usage examples.
+# rsync_module = {replication_ip}::container
+#
 # recon_cache_path = /var/cache/swift
 
 [container-updater]

diff --git a/etc/object-server.conf-sample b/etc/object-server.conf-sample
@@ -162,7 +162,6 @@ use = egg:swift#recon
 # log_level = INFO
 # log_address = /dev/log
 #
-# vm_test_mode = no
 # daemonize = on
 #
 # Time in seconds to wait between replication passes
@@ -195,6 +194,10 @@ use = egg:swift#recon
 # slow down the syncing process.
 # rsync_compress = no
 #
+# Format of the rysnc module where the replicator will send data. See
+# etc/rsyncd.conf-sample for some usage examples.
+# rsync_module = {replication_ip}::object
+#
 # node_timeout = <whatever's in the DEFAULT section or 10>
 # max duration of an http request; this is for REPLICATE finalization calls and
 # so should be longer than node_timeout