Merge "Make SAIO reconciler multiprocess"

5 files changed, 169 insertions, 5 deletions

diff --git a/doc/saio/swift/container-reconciler.conf b/doc/saio/swift/container-reconciler/1.conf
index 8dcb92f8f..9683504e8 100644
--- a/doc/saio/swift/container-reconciler.conf
+++ b/doc/saio/swift/container-reconciler/1.conf
@@ -27,6 +27,8 @@ user = <your-user-name>
 # reclaim_age = 604800
 # interval = 300
 # request_tries = 3
+processes = 4
+process = 0
 
 [pipeline:main]
 pipeline = catch_errors proxy-logging cache proxy-server
diff --git a/doc/saio/swift/container-reconciler/2.conf b/doc/saio/swift/container-reconciler/2.conf
new file mode 100644
index 000000000..e152aaa97
--- /dev/null
+++ b/doc/saio/swift/container-reconciler/2.conf
@@ -0,0 +1,49 @@
+[DEFAULT]
+# swift_dir = /etc/swift
+user = <your-user-name>
+# You can specify default log routing here if you want:
+# log_name = swift
+# log_facility = LOG_LOCAL0
+# log_level = INFO
+# log_address = /dev/log
+#
+# comma separated list of functions to call to setup custom log handlers.
+# functions get passed: conf, name, log_to_console, log_route, fmt, logger,
+# adapted_logger
+# log_custom_handlers =
+#
+# If set, log_udp_host will override log_address
+# log_udp_host =
+# log_udp_port = 514
+#
+# You can enable StatsD logging here:
+# log_statsd_host =
+# log_statsd_port = 8125
+# log_statsd_default_sample_rate = 1.0
+# log_statsd_sample_rate_factor = 1.0
+# log_statsd_metric_prefix =
+
+[container-reconciler]
+# reclaim_age = 604800
+# interval = 300
+# request_tries = 3
+processes = 4
+process = 1
+
+[pipeline:main]
+pipeline = catch_errors proxy-logging cache proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+# See proxy-server.conf-sample for options
+
+[filter:cache]
+use = egg:swift#memcache
+# See proxy-server.conf-sample for options
+
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+# See proxy-server.conf-sample for options
diff --git a/doc/saio/swift/container-reconciler/3.conf b/doc/saio/swift/container-reconciler/3.conf
new file mode 100644
index 000000000..31bfc4ffd
--- /dev/null
+++ b/doc/saio/swift/container-reconciler/3.conf
@@ -0,0 +1,49 @@
+[DEFAULT]
+# swift_dir = /etc/swift
+user = <your-user-name>
+# You can specify default log routing here if you want:
+# log_name = swift
+# log_facility = LOG_LOCAL0
+# log_level = INFO
+# log_address = /dev/log
+#
+# comma separated list of functions to call to setup custom log handlers.
+# functions get passed: conf, name, log_to_console, log_route, fmt, logger,
+# adapted_logger
+# log_custom_handlers =
+#
+# If set, log_udp_host will override log_address
+# log_udp_host =
+# log_udp_port = 514
+#
+# You can enable StatsD logging here:
+# log_statsd_host =
+# log_statsd_port = 8125
+# log_statsd_default_sample_rate = 1.0
+# log_statsd_sample_rate_factor = 1.0
+# log_statsd_metric_prefix =
+
+[container-reconciler]
+# reclaim_age = 604800
+# interval = 300
+# request_tries = 3
+processes = 4
+process = 2
+
+[pipeline:main]
+pipeline = catch_errors proxy-logging cache proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+# See proxy-server.conf-sample for options
+
+[filter:cache]
+use = egg:swift#memcache
+# See proxy-server.conf-sample for options
+
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+# See proxy-server.conf-sample for options
diff --git a/doc/saio/swift/container-reconciler/4.conf b/doc/saio/swift/container-reconciler/4.conf
new file mode 100644
index 000000000..b04dd110a
--- /dev/null
+++ b/doc/saio/swift/container-reconciler/4.conf
@@ -0,0 +1,49 @@
+[DEFAULT]
+# swift_dir = /etc/swift
+user = <your-user-name>
+# You can specify default log routing here if you want:
+# log_name = swift
+# log_facility = LOG_LOCAL0
+# log_level = INFO
+# log_address = /dev/log
+#
+# comma separated list of functions to call to setup custom log handlers.
+# functions get passed: conf, name, log_to_console, log_route, fmt, logger,
+# adapted_logger
+# log_custom_handlers =
+#
+# If set, log_udp_host will override log_address
+# log_udp_host =
+# log_udp_port = 514
+#
+# You can enable StatsD logging here:
+# log_statsd_host =
+# log_statsd_port = 8125
+# log_statsd_default_sample_rate = 1.0
+# log_statsd_sample_rate_factor = 1.0
+# log_statsd_metric_prefix =
+
+[container-reconciler]
+# reclaim_age = 604800
+# interval = 300
+# request_tries = 3
+processes = 4
+process = 3
+
+[pipeline:main]
+pipeline = catch_errors proxy-logging cache proxy-server
+
+[app:proxy-server]
+use = egg:swift#proxy
+# See proxy-server.conf-sample for options
+
+[filter:cache]
+use = egg:swift#memcache
+# See proxy-server.conf-sample for options
+
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
+[filter:catch_errors]
+use = egg:swift#catch_errors
+# See proxy-server.conf-sample for options
diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst
index 818e0845c..a072b329c 100644
--- a/doc/source/development_saio.rst
+++ b/doc/source/development_saio.rst
@@ -512,11 +512,6 @@ commands are as follows:
    .. literalinclude:: /../saio/swift/object-expirer.conf
       :language: ini
 
-#. ``/etc/swift/container-reconciler.conf``
-
-   .. literalinclude:: /../saio/swift/container-reconciler.conf
-      :language: ini
-
 #. ``/etc/swift/container-sync-realms.conf``
 
    .. literalinclude:: /../saio/swift/container-sync-realms.conf
@@ -532,6 +527,11 @@ commands are as follows:
    .. literalinclude:: /../saio/swift/container-server/1.conf
       :language: ini
 
+#. ``/etc/swift/container-reconciler/1.conf``
+
+   .. literalinclude:: /../saio/swift/container-reconciler/1.conf
+      :language: ini
+
 #. ``/etc/swift/object-server/1.conf``
 
    .. literalinclude:: /../saio/swift/object-server/1.conf
@@ -547,6 +547,11 @@ commands are as follows:
    .. literalinclude:: /../saio/swift/container-server/2.conf
       :language: ini
 
+#. ``/etc/swift/container-reconciler/2.conf``
+
+   .. literalinclude:: /../saio/swift/container-reconciler/2.conf
+      :language: ini
+
 #. ``/etc/swift/object-server/2.conf``
 
    .. literalinclude:: /../saio/swift/object-server/2.conf
@@ -562,6 +567,11 @@ commands are as follows:
    .. literalinclude:: /../saio/swift/container-server/3.conf
       :language: ini
 
+#. ``/etc/swift/container-reconciler/3.conf``
+
+   .. literalinclude:: /../saio/swift/container-reconciler/3.conf
+      :language: ini
+
 #. ``/etc/swift/object-server/3.conf``
 
    .. literalinclude:: /../saio/swift/object-server/3.conf
@@ -577,6 +587,11 @@ commands are as follows:
    .. literalinclude:: /../saio/swift/container-server/4.conf
       :language: ini
 
+#. ``/etc/swift/container-reconciler/4.conf``
+
+   .. literalinclude:: /../saio/swift/container-reconciler/4.conf
+      :language: ini
+
 #. ``/etc/swift/object-server/4.conf``
 
    .. literalinclude:: /../saio/swift/object-server/4.conf