openstack/swift
Code Issues Proposed changes

proxy-server: fix AttributeError in exception handler

Browse Source 
Fix an AttributeError that may be raised during exception handling in
the proxy object GET path. GetterBase.node was removed by the
RelatedChange.

Change-Id: Icf77b9d6b8065814033059e33aca6e98a633dbd4
RelatedChange: I76ea042ef4b3f5cc1caa4774e35d6191f4ca548e
This commit is contained in:
Alistair Coles 2023-08-08 16:21:28 +01:00
parent 54f8dd0ff8
commit 4a8879a364
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/proxy/controllers/base.py
View File

@ -1376,7 +1376,7 @@ class GetOrHeadHandler(GetterBase):
part_iter.close()
except ChunkReadTimeout:
self.app.exception_occurred(self.node, 'Object',
self.app.exception_occurred(self.source.node, 'Object',
'Trying to read during GET')
raise
except ChunkWriteTimeout:

2
swift/proxy/controllers/obj.py
View File

@ -2617,7 +2617,7 @@ class ECFragGetter(GetterBase):
part_iter.close()
except ChunkReadTimeout:
self.app.exception_occurred(self.node, 'Object',
self.app.exception_occurred(self.source.node, 'Object',
'Trying to read during GET')
raise
except ChunkWriteTimeout:

6
test/unit/proxy/controllers/test_obj.py
View File

@ -4538,8 +4538,12 @@ class TestECObjController(ECObjectControllerMixin, unittest.TestCase):
self.assertEqual(resp.status_int, 500)
self.assertEqual(len(log), self.policy.ec_n_unique_fragments * 2)
log_lines = self.app.logger.get_lines_for_level('error')
self.assertEqual(2, len(log_lines), log_lines)
self.assertIn('Trying to read during GET: ChunkReadTimeout',
log_lines[0])
# not the most graceful ending
self.assertIn('Unhandled exception', log_lines[-1])
self.assertIn('Unhandled exception in request: ChunkReadTimeout',
log_lines[1])
def test_GET_with_multirange_short_resume_body(self):
self.app.object_chunk_size = 256