Adapt worker and nanny to ipv6

Author: csfldf

distributed/comm/tcp.py

@@ -39,7 +39,7 @@
 )
 from distributed.protocol.utils import host_array, pack_frames_prelude, unpack_frames
 from distributed.system import MEMORY_LIMIT
-from distributed.utils import ensure_ip, ensure_memoryview, get_ip, get_ipv6, nbytes
+from distributed.utils import ensure_ip, ensure_memoryview, get_ip, nbytes
 
 logger = logging.getLogger(__name__)
 
@@ -759,10 +759,7 @@ def resolve_address(self, loc):
     def get_local_address_for(self, loc):
         host, port = parse_host_port(loc)
         host = ensure_ip(host)
-        if ":" in host:
-            local_host = get_ipv6(host)
-        else:
-            local_host = get_ip(host)
+        local_host = get_ip(host)
         return unparse_host_port(local_host, None)
 
 

distributed/nanny.py

@@ -27,7 +27,7 @@
 from distributed import preloading
 from distributed._async_taskgroup import AsyncTaskGroupClosedError
 from distributed.comm import get_address_host
-from distributed.comm.addressing import address_from_user_args
+from distributed.comm.addressing import address_from_user_args, unparse_host_port
 from distributed.compatibility import asyncio_run
 from distributed.config import get_loop_factory
 from distributed.core import (
@@ -276,7 +276,7 @@ def __init__(  # type: ignore[no-untyped-def]
             and not interface
             and not self.scheduler_addr.startswith("inproc://")
         ):
-            host = get_ip(get_address_host(self.scheduler.address))
+            host = unparse_host_port(get_ip(get_address_host(self.scheduler.address)))
 
         self._start_port = port
         self._start_host = host

distributed/node.py

@@ -176,7 +176,8 @@ def start_http_server(
         bound_addresses = get_tcp_server_addresses(self.http_server)
 
         # If more than one address is configured we just use the first here
-        self.http_server.address, self.http_server.port = bound_addresses[0]
+        # Socket addresses representation: https://docs.python.org/3/library/socket.html#socket-families
+        self.http_server.address, self.http_server.port = bound_addresses[0][:2]
         self.services["dashboard"] = self.http_server
 
         # Warn on port changes

distributed/utils.py

@@ -213,10 +213,15 @@ def get_ip(host="8.8.8.8", port=80):
     """
     Get the local IP address through which the *host* is reachable.
 
+    It will try to get ipv4 or ipv6 adaptively depending on the *host* to reach.
+
     *host* defaults to a well-known Internet host (one of Google's public
     DNS servers).
     """
-    return _get_ip(host, port, family=socket.AF_INET)
+    if ":" in host:
+        return _get_ip(host, port, family=socket.AF_INET6)
+    else:
+        return _get_ip(host, port, family=socket.AF_INET)
 
 
 def get_ipv6(host="2001:4860:4860::8888", port=80):