openstack/swift
Code Issues Proposed changes

Fix ssync related object-server docs

Browse Source 
Swift now uses SSYNC verb instead of old REPLICATION verb for ssync
protocol. This patch replaces all docs written as REPLICATION into
SSYNC and fix a few words for explanation.

Change-Id: I1253210d4f49749e7d425d6252dd262b650d9548
This commit is contained in:
Kota Tsuyuzaki
2016-03-10 06:42:57 -08:00
parent f2e344a4d9
commit ecbcc94989
5 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
doc/manpages/object-server.conf.5
View File

@@ -207,20 +207,21 @@ set to a True value (e.g. "True" or "1"). To handle only non-replication
verbs, set to "False". Unless you have a separate replication network, you verbs, set to "False". Unless you have a separate replication network, you
should not specify any value for "replication_server". should not specify any value for "replication_server".
.IP "\fBreplication_concurrency\fR" .IP "\fBreplication_concurrency\fR"
Set to restrict the number of concurrent incoming REPLICATION requests Set to restrict the number of concurrent incoming SSYNC requests
Set to 0 for unlimited (the default is 4). Note that REPLICATION is currently an ssync only item. Set to 0 for unlimited (the default is 4). Note that SSYNC requests are only used
by the object reconstructor or the object replicator when configured to use ssync.
.IP "\fBreplication_one_per_device\fR" .IP "\fBreplication_one_per_device\fR"
Restricts incoming REPLICATION requests to one per device, Restricts incoming SSYNC requests to one per device,
replication_currency above allowing. This can help control I/O to each replication_currency above allowing. This can help control I/O to each
device, but you may wish to set this to False to allow multiple REPLICATION device, but you may wish to set this to False to allow multiple SSYNC
requests (up to the above replication_concurrency setting) per device. The default is true. requests (up to the above replication_concurrency setting) per device. The default is true.
.IP "\fBreplication_lock_timeout\fR" .IP "\fBreplication_lock_timeout\fR"
Number of seconds to wait for an existing replication device lock before Number of seconds to wait for an existing replication device lock before
giving up. The default is 15. giving up. The default is 15.
.IP "\fBreplication_failure_threshold\fR" .IP "\fBreplication_failure_threshold\fR"
.IP "\fBreplication_failure_ratio\fR" .IP "\fBreplication_failure_ratio\fR"
These two settings control when the REPLICATION subrequest handler will These two settings control when the SSYNC subrequest handler will
abort an incoming REPLICATION attempt. An abort will occur if there are at abort an incoming SSYNC attempt. An abort will occur if there are at
least threshold number of failures and the value of failures / successes least threshold number of failures and the value of failures / successes
exceeds the ratio. The defaults of 100 and 1.0 means that at least 100 exceeds the ratio. The defaults of 100 and 1.0 means that at least 100
failures have to occur and there have to be more failures than successes for failures have to occur and there have to be more failures than successes for

10
doc/source/deployment_guide.rst
View File

@@ -569,15 +569,15 @@ replication_server Configure parameter for cr
should not specify any value for should not specify any value for
"replication_server". "replication_server".
replication_concurrency 4 Set to restrict the number of replication_concurrency 4 Set to restrict the number of
concurrent incoming REPLICATION concurrent incoming SSYNC
requests; set to 0 for unlimited requests; set to 0 for unlimited
replication_one_per_device True Restricts incoming REPLICATION replication_one_per_device True Restricts incoming SSYNC
requests to one per device, requests to one per device,
replication_currency above replication_currency above
allowing. This can help control allowing. This can help control
I/O to each device, but you may I/O to each device, but you may
wish to set this to False to wish to set this to False to
allow multiple REPLICATION allow multiple SSYNC
requests (up to the above requests (up to the above
replication_concurrency setting) replication_concurrency setting)
per device. per device.
@@ -589,9 +589,9 @@ replication_failure_threshold 100 The number of subrequest f
replication_failure_ratio is replication_failure_ratio is
checked checked
replication_failure_ratio 1.0 If the value of failures / replication_failure_ratio 1.0 If the value of failures /
successes of REPLICATION successes of SSYNC
subrequests exceeds this ratio, subrequests exceeds this ratio,
the overall REPLICATION request the overall SSYNC request
will be aborted will be aborted
splice no Use splice() for zero-copy object splice no Use splice() for zero-copy object
GETs. This requires Linux kernel GETs. This requires Linux kernel

13
etc/object-server.conf-sample
View File

@@ -118,14 +118,15 @@ use = egg:swift#object
# should not specify any value for "replication_server". # should not specify any value for "replication_server".
# replication_server = false # replication_server = false
# #
# Set to restrict the number of concurrent incoming REPLICATION requests # Set to restrict the number of concurrent incoming SSYNC requests
# Set to 0 for unlimited # Set to 0 for unlimited
# Note that REPLICATION is currently an ssync only item # Note that SSYNC requests are only used by the object reconstructor or the
# object replicator when configured to use ssync.
# replication_concurrency = 4 # replication_concurrency = 4
# #
# Restricts incoming REPLICATION requests to one per device, # Restricts incoming SSYNC requests to one per device,
# replication_currency above allowing. This can help control I/O to each # replication_currency above allowing. This can help control I/O to each
# device, but you may wish to set this to False to allow multiple REPLICATION # device, but you may wish to set this to False to allow multiple SSYNC
# requests (up to the above replication_concurrency setting) per device. # requests (up to the above replication_concurrency setting) per device.
# replication_one_per_device = True # replication_one_per_device = True
# #
@@ -133,8 +134,8 @@ use = egg:swift#object
# giving up. # giving up.
# replication_lock_timeout = 15 # replication_lock_timeout = 15
# #
# These next two settings control when the REPLICATION subrequest handler will # These next two settings control when the SSYNC subrequest handler will
# abort an incoming REPLICATION attempt. An abort will occur if there are at # abort an incoming SSYNC attempt. An abort will occur if there are at
# least threshold number of failures and the value of failures / successes # least threshold number of failures and the value of failures / successes
# exceeds the ratio. The defaults of 100 and 1.0 means that at least 100 # exceeds the ratio. The defaults of 100 and 1.0 means that at least 100
# failures have to occur and there have to be more failures than successes for # failures have to occur and there have to be more failures than successes for

2
swift/obj/server.py
View File

@@ -1108,7 +1108,7 @@ def global_conf_callback(preloaded_app_conf, global_conf):
""" """
Callback for swift.common.wsgi.run_wsgi during the global_conf Callback for swift.common.wsgi.run_wsgi during the global_conf
creation so that we can add our replication_semaphore, used to creation so that we can add our replication_semaphore, used to
limit the number of concurrent REPLICATION_REQUESTS across all limit the number of concurrent SSYNC_REQUESTS across all
workers. workers.
:param preloaded_app_conf: The preloaded conf for the WSGI app. :param preloaded_app_conf: The preloaded conf for the WSGI app.

2
test/unit/obj/test_diskfile.py
View File

@@ -4398,7 +4398,7 @@ class TestSuffixHashes(unittest.TestCase):
* get_hashes(device, partition, suffixes, policy) * get_hashes(device, partition, suffixes, policy)
* invalidate_hash(suffix_dir) * invalidate_hash(suffix_dir)
The Manager.get_hashes method (used by the REPLICATION verb) The Manager.get_hashes method (used by the REPLICATE verb)
calls Manager._get_hashes (which may be an alias to the module calls Manager._get_hashes (which may be an alias to the module
method get_hashes), which calls hash_suffix, which calls method get_hashes), which calls hash_suffix, which calls
hash_cleanup_listdir. hash_cleanup_listdir.