summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShreeya Deshpande <shreeyad@nvidia.com>2023-04-26 14:29:19 -0700
committerShreeya Deshpande <shreeyad@nvidia.com>2023-04-27 23:21:04 +0000
commit9dfbac7c4d600a90fa0eafcc55faf72a8daa41bf (patch)
treec4b374ed931f4d293b17043725047d8968307251
parent9f7527973997baa5e685ea57d1563232234bc872 (diff)
downloadswift-9dfbac7c4d600a90fa0eafcc55faf72a8daa41bf.tar.gz
Error logs changed for ChunkWriteTimeout
The log message phrase 'ChunkWriteTimeout fetching fragments' implies that the timeout has occurred while getting a fragment (from the backend object server) when in fact the timeout has occurred waiting to yield the fragment to the app iter. Hence, changing message to 'ChunkWriteTimeout feeding fragments' Change-Id: Ic0813e6a9844da1130091d27e3dbe272ea871d11
-rw-r--r--swift/proxy/controllers/obj.py2
-rw-r--r--test/unit/proxy/controllers/test_obj.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py
index 057c77ffa..fe0471191 100644
--- a/swift/proxy/controllers/obj.py
+++ b/swift/proxy/controllers/obj.py
@@ -1518,7 +1518,7 @@ class ECAppIter(object):
except ChunkWriteTimeout:
# slow client disconnect
self.logger.exception(
- "ChunkWriteTimeout fetching fragments for %r",
+ "ChunkWriteTimeout feeding fragments for %r",
quote(self.path))
except: # noqa
self.logger.exception("Exception fetching fragments for %r",
diff --git a/test/unit/proxy/controllers/test_obj.py b/test/unit/proxy/controllers/test_obj.py
index 79753e00b..6c2c2bdab 100644
--- a/test/unit/proxy/controllers/test_obj.py
+++ b/test/unit/proxy/controllers/test_obj.py
@@ -4961,7 +4961,7 @@ class TestECObjController(ECObjectControllerMixin, unittest.TestCase):
log_lines = self.app.logger.get_lines_for_level('error')
self.assertTrue(log_lines)
for line in log_lines:
- self.assertIn('ChunkWriteTimeout fetching fragments', line)
+ self.assertIn('ChunkWriteTimeout feeding fragments', line)
# client gets a short read
self.assertEqual(16051, len(test_data))
self.assertEqual(8192, len(resp_body))