openstack/swift
Code Issues Proposed changes

lower the default yield frequency for bulk requests

Browse Source 
closes bug 1270246

DocImpact

Change-Id: If7f484d1a580e991896ac55f822655110266f3fa
This commit is contained in:
John Dickinson 2014-01-17 09:56:52 -08:00 committed by Peter Portante
parent a8ba751370
commit 892c226ce5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/proxy-server.conf-sample
View File

@ -489,7 +489,11 @@ use = egg:swift#bulk
# max_failed_extractions = 1000
# max_deletes_per_request = 10000
# max_failed_deletes = 1000
# yield_frequency = 60
# In order to keep a connection active during a potentially long bulk request,
# Swift may return whitespace prepended to the actual response body. This
# whitespace will be yielded no more than every yield_frequency seconds.
# yield_frequency = 10
# Note: The following parameter is used during a bulk delete of objects and
# their container. This would frequently fail because it is very likely

4
swift/common/middleware/bulk.py
View File

@ -187,7 +187,7 @@ class Bulk(object):
def __init__(self, app, conf, max_containers_per_extraction=10000,
max_failed_extractions=1000, max_deletes_per_request=10000,
max_failed_deletes=1000, yield_frequency=60, retry_count=0,
max_failed_deletes=1000, yield_frequency=10, retry_count=0,
retry_interval=1.5, logger=None):
self.app = app
self.logger = logger or get_logger(conf, log_route='bulk')
@ -563,7 +563,7 @@ def filter_factory(global_conf, **local_conf):
max_failed_extractions = int(conf.get('max_failed_extractions', 1000))
max_deletes_per_request = int(conf.get('max_deletes_per_request', 10000))
max_failed_deletes = int(conf.get('max_failed_deletes', 1000))
yield_frequency = int(conf.get('yield_frequency', 60))
yield_frequency = int(conf.get('yield_frequency', 10))
retry_count = int(conf.get('delete_container_retry_count', 0))
retry_interval = 1.5