[3.1] fix resolve cancellation (#2910) (#2931)

* fix resolve cancellation * fixes based on review * changes based on review * add changes file * rename (cherry picked from commit a7bbaad) Co-authored-by: Alexander Mohr <thehesiod@users.noreply.github.com>
aio-libs · Apr 12, 2018 · 68940b9 · 68940b9
1 parent ae2dbcb
commit 68940b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES/2910.bugfix b/CHANGES/2910.bugfix
@@ -0,0 +1 @@
+fix cancellation broadcast during DNS resolve
diff --git a/aiohttp/connector.py b/aiohttp/connector.py
@@ -700,10 +700,7 @@ async def _resolve_host(self, host, port, traces=None):
                         await trace.send_dns_resolvehost_start(host)
 
                 addrs = await \
-                    asyncio.shield(self._resolver.resolve(host,
-                                                          port,
-                                                          family=self._family),
-                                   loop=self._loop)
+                    self._resolver.resolve(host, port, family=self._family)
                 if traces:
                     for trace in traces:
                         await trace.send_dns_resolvehost_end(host)
@@ -813,10 +810,13 @@ async def _create_direct_connection(self, req,
         fingerprint = self._get_fingerprint(req)
 
         try:
-            hosts = await self._resolve_host(
+            # Cancelling this lookup should not cancel the underlying lookup
+            #  or else the cancel event will get broadcast to all the waiters
+            #  across all connections.
+            hosts = await asyncio.shield(self._resolve_host(
                 req.url.raw_host,
                 req.port,
-                traces=traces)
+                traces=traces), loop=self._loop)
         except OSError as exc:
             # in case of proxy it is not ClientProxyConnectionError
             # it is problem of resolving proxy ip itself