From e58840c571b1a1fe9ae9017a07c6754a10cbf69b Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Mon, 14 Oct 2019 11:01:59 -0700 Subject: [PATCH] swift-account-audit: work with encryption Change-Id: I26c5fe9d45a9765da0d30138ea2df16fd4e73d57 --- bin/swift-account-audit | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/swift-account-audit b/bin/swift-account-audit index f0ad4e7de0..c3862a7975 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