openstack/swift
Code Issues Proposed changes

memcached: add method and time_spent to exception logs

Browse Source 
The method and time_spent were previously added to the error log
messages. This patch does the same for exception logging.

Change-Id: I3e08b8f1d7329f8964d8407cb2e125deb9966a8a
Related-Change: I4d4f20b92b85255ac8bf66f2c830e691e64bbe47
This commit is contained in:
Alistair Coles 2023-05-26 16:25:48 +01:00
parent 49a5293cbd
commit a25087e1c7
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swift/common/memcached.py
View File

@ -285,10 +285,13 @@ class MemcacheRing(object):
'memcached.' + cmd.method + '.conn_err.timing',
conn_start_time)
else:
self.logger.exception("Error %(action)s to memcached: %(server)s"
": with key_prefix %(key_prefix)s",
{'action': action, 'server': server,
'key_prefix': cmd.key_prefix})
self.logger.exception(
"Error %(action)s to memcached: %(server)s"
": with key_prefix %(key_prefix)s, method %(method)s, "
"time_spent %(time_spent)s",
{'action': action, 'server': server,
'key_prefix': cmd.key_prefix, 'method': cmd.method,
'time_spent': tm.time() - conn_start_time})
self.logger.timing_since(
'memcached.' + cmd.method + '.errors.timing', conn_start_time)

27
test/unit/common/test_memcached.py
View File

@ -1195,9 +1195,10 @@ class TestMemcached(unittest.TestCase):
self.assertEqual('memcached.incr.errors.timing',
last_stats[0][0])
self.assertEqual(last_stats[0][1], 4000.99)
self.assertEqual('Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix incr_key: ',
self.logger.get_lines_for_level('error')[0])
self.assertEqual(
'Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix incr_key, method incr, time_spent 0.0: ',
self.logger.get_lines_for_level('error')[0])
def test_operations_timing_stats_with_set_exception(self):
memcache_client = memcached.MemcacheRing(['1.2.3.4:11211'],
@ -1222,9 +1223,10 @@ class TestMemcached(unittest.TestCase):
self.assertEqual('memcached.set.errors.timing',
last_stats[0][0])
self.assertEqual(last_stats[0][1], 4000.99)
self.assertEqual('Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix set_key: ',
self.logger.get_lines_for_level('error')[0])
self.assertEqual(
'Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix set_key, method set, time_spent 0.0: ',
self.logger.get_lines_for_level('error')[0])
def test_operations_timing_stats_with_get_exception(self):
memcache_client = memcached.MemcacheRing(['1.2.3.4:11211'],
@ -1247,9 +1249,10 @@ class TestMemcached(unittest.TestCase):
self.assertEqual('memcached.get.errors.timing',
last_stats[0][0])
self.assertEqual(last_stats[0][1], 4000.99)
self.assertEqual('Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix get_key: ',
self.logger.get_lines_for_level('error')[0])
self.assertEqual(
'Error talking to memcached: 1.2.3.4:11211: '
'with key_prefix get_key, method get, time_spent 0.0: ',
self.logger.get_lines_for_level('error')[0])
def test_operations_timing_stats_with_get_error(self):
memcache_client = memcached.MemcacheRing(['1.2.3.4:11211'],
@ -1445,10 +1448,10 @@ class TestMemcached(unittest.TestCase):
error_logs = self.logger.get_lines_for_level('error')
self.assertIn('Error talking to memcached: 1.2.3.4:11211: ',
error_logs[0])
self.assertIn("with key_prefix shard-updating-v2/acc"
% resp.split(), error_logs[0])
self.assertIn("with key_prefix shard-updating-v2/acc, method incr, "
"time_spent 1.0" % resp.split(), error_logs[0])
self.assertIn('1.2.3.4:11211', memcache_client._errors)
self.assertEqual([4003.99], memcache_client._errors['1.2.3.4:11211'])
self.assertEqual([4004.99], memcache_client._errors['1.2.3.4:11211'])
class ExcConfigParser(object):