openstack/swift
Code Issues Proposed changes

Merge "swift-account-audit: work with encryption"

Browse Source
This commit is contained in:
Zuul
2020-01-22 16:59:19 +00:00
committed by Gerrit Code Review
parent b7c1f8d149 e58840c571
commit 02aea34c46
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/swift-account-audit
View File

@@ -108,7 +108,6 @@ class Auditor(object):
consistent = False consistent = False
print(' MD5 does not match etag for "%s" on %s/%s' print(' MD5 does not match etag for "%s" on %s/%s'
% (path, node['ip'], node['device'])) % (path, node['ip'], node['device']))
etags.append((resp.getheader('ETag'), node))
else: else:
conn = http_connect(node['ip'], node['port'], conn = http_connect(node['ip'], node['port'],
node['device'], part, 'HEAD', node['device'], part, 'HEAD',
@@ -120,6 +119,12 @@ class Auditor(object):
print(' Bad status HEADing object "%s" on %s/%s' print(' Bad status HEADing object "%s" on %s/%s'
% (path, node['ip'], node['device'])) % (path, node['ip'], node['device']))
continue continue
override_etag = resp.getheader(
'X-Object-Sysmeta-Container-Update-Override-Etag')
if override_etag:
etags.append((override_etag, node))
else:
etags.append((resp.getheader('ETag'), node)) etags.append((resp.getheader('ETag'), node))
except Exception: except Exception:
self.object_exceptions += 1 self.object_exceptions += 1