openstack/swift
Code Issues Proposed changes

Merge "proxy-server: fix AttributeError in exception handler"

Browse Source
This commit is contained in:
Zuul 2023-08-09 12:11:51 +00:00 committed by Gerrit Code Review
commit dce403f0fb
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