openstack/swift
Code Issues Proposed changes

Don't unnecessarily quote account, container or object values.

Browse Source 
This fixed the problem where containers or objects with characters
that need quoting can't be audited because they aren't found.
This commit is contained in:
Chris Wedgwood 2011-01-13 23:17:36 -08:00
parent 0fb41841fa
commit e618dd567f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/swift-account-audit
View File

@ -72,7 +72,7 @@ class Auditor(object):
self.in_progress = {} self.in_progress = {}
def audit_object(self, account, container, name): def audit_object(self, account, container, name):
path = '/%s/%s/%s' % (quote(account), quote(container), quote(name)) path = '/%s/%s/%s' % (account, container, name)
part, nodes = self.object_ring.get_nodes(account, container, name) part, nodes = self.object_ring.get_nodes(account, container, name)
container_listing = self.audit_container(account, container) container_listing = self.audit_container(account, container)
consistent = True consistent = True
@ -145,7 +145,7 @@ class Auditor(object):
return self.list_cache[(account, name)] return self.list_cache[(account, name)]
self.in_progress[(account, name)] = Event() self.in_progress[(account, name)] = Event()
print 'Auditing container "%s"...' % name print 'Auditing container "%s"...' % name
path = '/%s/%s' % (quote(account), quote(name)) path = '/%s/%s' % (account, name)
account_listing = self.audit_account(account) account_listing = self.audit_account(account)
consistent = True consistent = True
if name not in account_listing: if name not in account_listing:
@ -189,7 +189,7 @@ class Auditor(object):
self.container_obj_mismatch += 1 self.container_obj_mismatch += 1
consistent = False consistent = False
print " Different versions of %s/%s in container dbs." % \ print " Different versions of %s/%s in container dbs." % \
(quote(name), quote(obj['name'])) name, obj['name']
if obj['last_modified'] > rec_d[obj_name]['last_modified']: if obj['last_modified'] > rec_d[obj_name]['last_modified']:
rec_d[obj_name] = obj rec_d[obj_name] = obj
obj_counts = [int(header['x-container-object-count']) obj_counts = [int(header['x-container-object-count'])