release-22.1:Backport!6380

core/http/client.py

 # ----------------------------------------------------------------------
 # HTTP Client
 # ----------------------------------------------------------------------
-# Copyright (C) 2007-2020 The NOC Project
+# Copyright (C) 2007-2022 The NOC Project
 # See LICENSE for details
 # ----------------------------------------------------------------------
 
@@ -205,7 +205,7 @@ async def fetch(
             writer.write(smart_bytes(req))
             try:
                 await asyncio.wait_for(writer.drain(), request_timeout)
-            except asyncio.TimeoutError:
+            except (asyncio.TimeoutError, TimeoutError):
                 metrics["httpclient_proxy_timeouts"] += 1
                 return ERR_TIMEOUT, {}, b"Timed out while sending request to proxy"
             # Wait for proxy response
@@ -213,7 +213,7 @@ async def fetch(
             while not parser.is_headers_complete():
                 try:
                     data = await asyncio.wait_for(reader.read(max_buffer_size), request_timeout)
-                except asyncio.TimeoutError:
+                except (asyncio.TimeoutError, TimeoutError):
                     metrics["httpclient_proxy_timeouts"] += 1
                     return ERR_TIMEOUT, {}, b"Timed out while sending request to proxy"
                 received = len(data)
@@ -282,7 +282,7 @@ async def fetch(
         except ConnectionResetError:
             metrics["httpclient_timeouts"] += 1
             return ERR_TIMEOUT, {}, b"Connection reset while sending request"
-        except asyncio.TimeoutError:
+        except (asyncio.TimeoutError, TimeoutError):
             metrics["httpclient_timeouts"] += 1
             return ERR_TIMEOUT, {}, b"Timed out while sending request"
         parser = HttpParser()
@@ -293,7 +293,7 @@ async def fetch(
                 is_eof = not data
             except (asyncio.IncompleteReadError, ConnectionResetError):
                 is_eof = True
-            except asyncio.TimeoutError:
+            except (asyncio.TimeoutError, TimeoutError):
                 metrics["httpclient_timeouts"] += 1
                 return ERR_READ_TIMEOUT, {}, b"Request timed out"
             if is_eof: