openstack/swift
Code Issues Proposed changes

Merge "Small efficiency improvement in account quotas"

Browse Source
This commit is contained in:
Jenkins 2013-10-22 04:43:59 +00:00 committed by Gerrit Code Review
commit 6d255408cd
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
swift/common/middleware/account_quotas.py
View File

@ -101,6 +101,16 @@ class AccountQuotaMiddleware(object):
copy_from = request.headers.get('X-Copy-From') copy_from = request.headers.get('X-Copy-From')
content_length = (request.content_length or 0) content_length = (request.content_length or 0)
account_info = get_account_info(request.environ, self.app)
if not account_info or not account_info['bytes']:
return self.app
try:
quota = int(account_info['meta'].get('quota-bytes', -1))
except ValueError:
return self.app
if quota < 0:
return self.app
if obj and copy_from: if obj and copy_from:
path = '/' + ver + '/' + account + '/' + copy_from.lstrip('/') path = '/' + ver + '/' + account + '/' + copy_from.lstrip('/')
object_info = get_object_info(request.environ, self.app, path) object_info = get_object_info(request.environ, self.app, path)
@ -109,17 +119,8 @@ class AccountQuotaMiddleware(object):
else: else:
content_length = int(object_info['length']) content_length = int(object_info['length'])
account_info = get_account_info(request.environ, self.app)
if not account_info or not account_info['bytes']:
return self.app
new_size = int(account_info['bytes']) + content_length new_size = int(account_info['bytes']) + content_length
try: if quota < new_size:
quota = int(account_info['meta'].get('quota-bytes', -1))
except ValueError:
return self.app
if 0 <= quota < new_size:
return HTTPRequestEntityTooLarge() return HTTPRequestEntityTooLarge()
return self.app return self.app