diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-22 16:59:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-22 16:59:19 +0000 |
| commit | 02aea34c46249fb315ff1fc0884c2a91ac663783 (patch) | |
| tree | 9805e1070c0fad4292c5aedc758f1d82073266d5 /bin | |
| parent | b7c1f8d149868f7865989a3ee7ac753a337fd3ca (diff) | |
| parent | e58840c571b1a1fe9ae9017a07c6754a10cbf69b (diff) | |
| download | swift-02aea34c46249fb315ff1fc0884c2a91ac663783.tar.gz | |
Merge "swift-account-audit: work with encryption"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/swift-account-audit | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/swift-account-audit b/bin/swift-account-audit index 5f7b1a9e1..a5a50dc1f 100755 --- a/bin/swift-account-audit +++ b/bin/swift-account-audit @@ -108,7 +108,6 @@ class Auditor(object): consistent = False print(' MD5 does not match etag for "%s" on %s/%s' % (path, node['ip'], node['device'])) - etags.append((resp.getheader('ETag'), node)) else: conn = http_connect(node['ip'], node['port'], node['device'], part, 'HEAD', @@ -120,6 +119,12 @@ class Auditor(object): print(' Bad status HEADing object "%s" on %s/%s' % (path, node['ip'], node['device'])) 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)) except Exception: self.object_exceptions += 1 |