From 5e3bc65ab24aaed16b4dff6b0de46d3b8059f1a1 Mon Sep 17 00:00:00 2001
From: Noah Stapp <noah.stapp@mongodb.com>
Date: Wed, 15 Jan 2025 12:08:14 -0500
Subject: [PATCH] Use run_in_executor for getaddrinfo

---
 pymongo/asynchronous/helpers.py | 20 ++++++++++++++++----
 pymongo/synchronous/helpers.py  | 20 ++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/pymongo/asynchronous/helpers.py b/pymongo/asynchronous/helpers.py
index b591f0a4da..4fba407267 100644
--- a/pymongo/asynchronous/helpers.py
+++ b/pymongo/asynchronous/helpers.py
@@ -17,6 +17,7 @@
 
 import asyncio
 import builtins
+import functools
 import socket
 import sys
 from typing import (
@@ -26,6 +27,7 @@
     cast,
 )
 
+from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.errors import (
     OperationFailure,
 )
@@ -70,14 +72,24 @@ async def inner(*args: Any, **kwargs: Any) -> Any:
     return cast(F, inner)
 
 
-async def getaddrinfo(host, port, **kwargs):
+async def getaddrinfo(
+    host: Any, port: Any, **kwargs: Any
+) -> list[
+    tuple[
+        socket.AddressFamily,
+        socket.SocketKind,
+        int,
+        str,
+        tuple[str, int] | tuple[str, int, int, int],
+    ]
+]:
     if not _IS_SYNC:
         loop = asyncio.get_running_loop()
-        return await loop.getaddrinfo(  # type: ignore[assignment]
-            host, port, **kwargs
+        return await loop.run_in_executor(  # type: ignore[return-value]
+            _PYMONGO_EXECUTOR, functools.partial(socket.getaddrinfo, host, port, **kwargs)
         )
     else:
-        return socket.getaddrinfo(host, port, **kwargs)  # type: ignore[assignment]
+        return socket.getaddrinfo(host, port, **kwargs)
 
 
 if sys.version_info >= (3, 10):
diff --git a/pymongo/synchronous/helpers.py b/pymongo/synchronous/helpers.py
index b65ce2fdb0..2158886c80 100644
--- a/pymongo/synchronous/helpers.py
+++ b/pymongo/synchronous/helpers.py
@@ -17,6 +17,7 @@
 
 import asyncio
 import builtins
+import functools
 import socket
 import sys
 from typing import (
@@ -26,6 +27,7 @@
     cast,
 )
 
+from pymongo._asyncio_executor import _PYMONGO_EXECUTOR
 from pymongo.errors import (
     OperationFailure,
 )
@@ -70,14 +72,24 @@ def inner(*args: Any, **kwargs: Any) -> Any:
     return cast(F, inner)
 
 
-def getaddrinfo(host, port, **kwargs):
+def getaddrinfo(
+    host: Any, port: Any, **kwargs: Any
+) -> list[
+    tuple[
+        socket.AddressFamily,
+        socket.SocketKind,
+        int,
+        str,
+        tuple[str, int] | tuple[str, int, int, int],
+    ]
+]:
     if not _IS_SYNC:
         loop = asyncio.get_running_loop()
-        return loop.getaddrinfo(  # type: ignore[assignment]
-            host, port, **kwargs
+        return loop.run_in_executor(  # type: ignore[return-value]
+            _PYMONGO_EXECUTOR, functools.partial(socket.getaddrinfo, host, port, **kwargs)
         )
     else:
-        return socket.getaddrinfo(host, port, **kwargs)  # type: ignore[assignment]
+        return socket.getaddrinfo(host, port, **kwargs)
 
 
 if sys.version_info >= (3, 10):