summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-04-28 11:37:04 +0000
committerGerrit Code Review <review@openstack.org>2023-04-28 11:37:04 +0000
commit31e51b3f8580d01f8da8a0b6d1415b406a82ff1e (patch)
treec09f00e6a567a2825864069cd3ed633294807351
parent3b89fbebd9adcf2b2247f9923f1e76491972a306 (diff)
parent9dfbac7c4d600a90fa0eafcc55faf72a8daa41bf (diff)
downloadswift-31e51b3f8580d01f8da8a0b6d1415b406a82ff1e.tar.gz
Merge "Error logs changed for ChunkWriteTimeout"
-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 fa9169e47..fc489b79b 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 8224a2f76..0b8bf1568 100644
--- a/test/unit/proxy/controllers/test_obj.py
+++ b/test/unit/proxy/controllers/test_obj.py
@@ -4962,7 +4962,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))