openstack/swift
Code Issues Proposed changes

Merge "test: do not create timestamp collision unnecessarily"

Browse Source
This commit is contained in:
Zuul
2025-09-16 17:05:45 +00:00
committed by Gerrit Code Review
parent d0a3b1b016 7b05356bd0
commit 4cacaa968f
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/unit/obj/test_auditor.py
View File

@@ -170,6 +170,10 @@ class TestAuditorBase(BaseTestCase):
@patch_policies(_mocked_policies) @patch_policies(_mocked_policies)
class TestAuditor(TestAuditorBase): class TestAuditor(TestAuditorBase):
def setUp(self):
super().setUp()
self.ts = make_timestamp_iter()
def test_worker_conf_parms(self): def test_worker_conf_parms(self):
def check_common_defaults(): def check_common_defaults():
self.assertEqual(auditor_worker.max_bytes_per_second, 10000000) self.assertEqual(auditor_worker.max_bytes_per_second, 10000000)
@@ -320,18 +324,18 @@ class TestAuditor(TestAuditorBase):
self.rcache, self.devices) self.rcache, self.devices)
data = b'0' * 1024 data = b'0' * 1024
etag = md5(usedforsecurity=False) etag = md5(usedforsecurity=False)
timestamp = str(normalize_timestamp(time.time())) timestamp = next(self.ts)
with self.disk_file.create() as writer: with self.disk_file.create() as writer:
writer.write(data) writer.write(data)
etag.update(data) etag.update(data)
etag = etag.hexdigest() etag = etag.hexdigest()
metadata = { metadata = {
'ETag': etag, 'ETag': etag,
'X-Timestamp': timestamp, 'X-Timestamp': timestamp.normal,
'Content-Length': str(os.fstat(writer._fd).st_size), 'Content-Length': str(os.fstat(writer._fd).st_size),
} }
writer.put(metadata) writer.put(metadata)
writer.commit(Timestamp(timestamp)) writer.commit(timestamp)
pre_quarantines = auditor_worker.quarantines pre_quarantines = auditor_worker.quarantines
# remake so it will have metadata # remake so it will have metadata
@@ -343,12 +347,14 @@ class TestAuditor(TestAuditorBase):
policy=POLICIES.legacy)) policy=POLICIES.legacy))
self.assertEqual(auditor_worker.quarantines, pre_quarantines) self.assertEqual(auditor_worker.quarantines, pre_quarantines)
etag = md5(b'1' + b'0' * 1023, usedforsecurity=False).hexdigest() etag = md5(b'1' + b'0' * 1023, usedforsecurity=False).hexdigest()
ts2 = next(self.ts)
metadata['ETag'] = etag metadata['ETag'] = etag
metadata['X-Timestamp'] = ts2.normal
with self.disk_file.create() as writer: with self.disk_file.create() as writer:
writer.write(data) writer.write(data)
writer.put(metadata) writer.put(metadata)
writer.commit(Timestamp(timestamp)) writer.commit(ts2)
auditor_worker.object_audit( auditor_worker.object_audit(
AuditLocation(self.disk_file._datadir, 'sda', '0', AuditLocation(self.disk_file._datadir, 'sda', '0',
@@ -671,7 +677,7 @@ class TestAuditor(TestAuditorBase):
auditor_worker = auditor.AuditorWorker(self.conf, self.logger, auditor_worker = auditor.AuditorWorker(self.conf, self.logger,
self.rcache, self.devices) self.rcache, self.devices)
auditor_worker.log_time = 0 auditor_worker.log_time = 0
timestamp = str(normalize_timestamp(time.time())) timestamp = next(self.ts)
pre_quarantines = auditor_worker.quarantines pre_quarantines = auditor_worker.quarantines
data = b'0' * 1024 data = b'0' * 1024
@@ -680,11 +686,11 @@ class TestAuditor(TestAuditorBase):
writer.write(data) writer.write(data)
metadata = { metadata = {
'ETag': md5(data, usedforsecurity=False).hexdigest(), 'ETag': md5(data, usedforsecurity=False).hexdigest(),
'X-Timestamp': timestamp, 'X-Timestamp': timestamp.normal,
'Content-Length': str(os.fstat(writer._fd).st_size), 'Content-Length': str(os.fstat(writer._fd).st_size),
} }
writer.put(metadata) writer.put(metadata)
writer.commit(Timestamp(timestamp)) writer.commit(timestamp)
# policy 0 # policy 0
write_file(self.disk_file) write_file(self.disk_file)
@@ -700,17 +706,18 @@ class TestAuditor(TestAuditorBase):
self.assertEqual(auditor_worker.stats_buckets[10240], 0) self.assertEqual(auditor_worker.stats_buckets[10240], 0)
# pick up some additional code coverage, large file # pick up some additional code coverage, large file
ts2 = next(self.ts)
data = b'0' * 1024 * 1024 data = b'0' * 1024 * 1024
for df in (self.disk_file, self.disk_file_ec): for df in (self.disk_file, self.disk_file_ec):
with df.create() as writer: with df.create() as writer:
writer.write(data) writer.write(data)
metadata = { metadata = {
'ETag': md5(data, usedforsecurity=False).hexdigest(), 'ETag': md5(data, usedforsecurity=False).hexdigest(),
'X-Timestamp': timestamp, 'X-Timestamp': ts2.normal,
'Content-Length': str(os.fstat(writer._fd).st_size), 'Content-Length': str(os.fstat(writer._fd).st_size),
} }
writer.put(metadata) writer.put(metadata)
writer.commit(Timestamp(timestamp)) writer.commit(ts2)
auditor_worker.audit_all_objects(device_dirs=['sda', 'sdb']) auditor_worker.audit_all_objects(device_dirs=['sda', 'sdb'])
self.assertEqual(auditor_worker.quarantines, pre_quarantines) self.assertEqual(auditor_worker.quarantines, pre_quarantines)
# still have the 1024 byte object left in policy-1 (plus the # still have the 1024 byte object left in policy-1 (plus the