From 64a3d30a57952ec86caa2688d4a98696a486d3ea Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 11:48:42 +0100
Subject: [PATCH] [PR #8980/ea316336 backport][3.10] Fix resolve_host "Task was
 destroyed but it is pending" errors (#8967) (#8984)

**This is a backport of PR #8980 as merged into 3.11
(ea316336f0b247bb85fd7ee0e4e41f5eac682228).**

(cherry picked from commit cd761a347be2609deca503646b9b5fb3585b2fda)

Co-authored-by: Sam Bull <git@sambull.org>
---
 CHANGES/8967.bugfix.rst |  1 +
 aiohttp/connector.py    |  6 ++++++
 tests/test_connector.py | 38 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 CHANGES/8967.bugfix.rst

diff --git a/CHANGES/8967.bugfix.rst b/CHANGES/8967.bugfix.rst
new file mode 100644
index 00000000000..1046f36bd8b
--- /dev/null
+++ b/CHANGES/8967.bugfix.rst
@@ -0,0 +1 @@
+Fixed resolve_host() 'Task was destroyed but is pending' errors -- by :user:`Dreamsorcerer`.
diff --git a/aiohttp/connector.py b/aiohttp/connector.py
index 04115c36a24..7c6e747695e 100644
--- a/aiohttp/connector.py
+++ b/aiohttp/connector.py
@@ -824,12 +824,16 @@ def __init__(
         self._local_addr_infos = aiohappyeyeballs.addr_to_addr_infos(local_addr)
         self._happy_eyeballs_delay = happy_eyeballs_delay
         self._interleave = interleave
+        self._resolve_host_tasks: Set["asyncio.Task[List[ResolveResult]]"] = set()
 
     def close(self) -> Awaitable[None]:
         """Close all ongoing DNS calls."""
         for ev in self._throttle_dns_events.values():
             ev.cancel()
 
+        for t in self._resolve_host_tasks:
+            t.cancel()
+
         return super().close()
 
     @property
@@ -907,6 +911,8 @@ async def _resolve_host(
         resolved_host_task = asyncio.create_task(
             self._resolve_host_with_throttle(key, host, port, traces)
         )
+        self._resolve_host_tasks.add(resolved_host_task)
+        resolved_host_task.add_done_callback(self._resolve_host_tasks.discard)
         try:
             return await asyncio.shield(resolved_host_task)
         except asyncio.CancelledError:
diff --git a/tests/test_connector.py b/tests/test_connector.py
index 8dd7a294b30..0129f0cc330 100644
--- a/tests/test_connector.py
+++ b/tests/test_connector.py
@@ -9,7 +9,7 @@
 import sys
 import uuid
 from collections import deque
-from contextlib import closing
+from contextlib import closing, suppress
 from typing import Any, List, Optional, Type
 from unittest import mock
 
@@ -1667,7 +1667,41 @@ async def test_close_cancels_cleanup_handle(loop) -> None:
     assert conn._cleanup_handle is None
 
 
-async def test_close_abort_closed_transports(loop) -> None:
+async def test_close_cancels_resolve_host(loop: asyncio.AbstractEventLoop) -> None:
+    cancelled = False
+
+    async def delay_resolve_host(*args: object) -> None:
+        """Delay _resolve_host() task in order to test cancellation."""
+        nonlocal cancelled
+        try:
+            await asyncio.sleep(10)
+        except asyncio.CancelledError:
+            cancelled = True
+            raise
+
+    conn = aiohttp.TCPConnector()
+    req = ClientRequest(
+        "GET", URL("http://localhost:80"), loop=loop, response_class=mock.Mock()
+    )
+    with mock.patch.object(conn, "_resolve_host_with_throttle", delay_resolve_host):
+        t = asyncio.create_task(conn.connect(req, [], ClientTimeout()))
+        # Let it create the internal task
+        await asyncio.sleep(0)
+        # Let that task start running
+        await asyncio.sleep(0)
+
+        # We now have a task being tracked and can ensure that .close() cancels it.
+        assert len(conn._resolve_host_tasks) == 1
+        await conn.close()
+        await asyncio.sleep(0.01)
+        assert cancelled
+        assert len(conn._resolve_host_tasks) == 0
+
+        with suppress(asyncio.CancelledError):
+            await t
+
+
+async def test_close_abort_closed_transports(loop: asyncio.AbstractEventLoop) -> None:
     tr = mock.Mock()
 
     conn = aiohttp.BaseConnector(loop=loop)