openstack/swift
Code Issues Proposed changes

sharder: Fix completed metric emission

Browse Source 
Related-Change: Ie2a8e4eced6688e5a98aa37c3c7b0c13fd2ddeee
Change-Id: Ic19964f1fc4e99f586364aefa1033800dd9bf143
This commit is contained in:
Tim Burke 2023-06-23 16:42:17 -07:00
parent c5a3354fea
commit 0e0db9003f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/container/sharder.py
View File

@ -2396,7 +2396,7 @@ class ContainerSharder(ContainerSharderConf, ContainerReplicator):
'state')
self.logger.timing_since(
'sharder.sharding.completed',
broker.get_own_shard_range().epoch)
float(broker.get_own_shard_range().epoch))
else:
self.info(broker, 'Completed cleaving, DB remaining in '
'sharding state')

6
test/unit/container/test_sharder.py
View File

@ -2476,6 +2476,9 @@ class TestSharder(BaseTestSharder):
self.assertEqual('sharder.sharding.cleave',
self.logger.log_dict['timing_since'][-1][0][0])
self.assertGreater(self.logger.log_dict['timing_since'][-1][0][1], 0)
for call in self.logger.log_dict['timing_since']:
self.assertNotIsInstance(call[0][1], Timestamp)
self.assertIsInstance(call[0][1], float)
lines = sharder.logger.get_lines_for_level('info')
self.assertEqual(
["Kick off container cleaving, own shard range in state "
@ -2534,6 +2537,9 @@ class TestSharder(BaseTestSharder):
self.assertEqual('sharder.sharding.send_sr',
self.logger.log_dict['timing_since'][-1][0][0])
self.assertGreater(self.logger.log_dict['timing_since'][-1][0][1], 0)
for call in self.logger.log_dict['timing_since']:
self.assertNotIsInstance(call[0][1], Timestamp)
self.assertIsInstance(call[0][1], float)
def test_cleave_timing_metrics(self):
broker = self._make_broker()