1d81bfaed1
### What this PR does / why we need it?
This pacth mainly do the following things:
1. Bugfix for multi_node_tests log, log names must be unique when
uploading logs.
2. Optimize `get_cluster_ips` logic, increase the max retry times for
robustness
3. Abandoned the existing gh-proxy temporarily until it is stable
enough.
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: release/v0.13.0
- vLLM main:
81786c8774
---------
Signed-off-by: wangli <wangli858794774@gmail.com>
130 lines
3.7 KiB
Python
130 lines
3.7 KiB
Python
import logging
|
|
import os
|
|
import socket
|
|
import time
|
|
from contextlib import contextmanager
|
|
from typing import Optional
|
|
|
|
import psutil
|
|
|
|
|
|
@contextmanager
|
|
def temp_env(env_dict):
|
|
old_env = {}
|
|
for k, v in env_dict.items():
|
|
old_env[k] = os.environ.get(k)
|
|
os.environ[k] = str(v)
|
|
try:
|
|
yield
|
|
finally:
|
|
for k, v in old_env.items():
|
|
if v is None:
|
|
os.environ.pop(k, None)
|
|
else:
|
|
os.environ[k] = v
|
|
|
|
|
|
def dns_resolver(retries: int = 240, base_delay: float = 0.5):
|
|
# We should resolve DNS with retries to avoid transient network issues.
|
|
# When the pod is just started, DNS resolution may fail.
|
|
def resolve(dns: str):
|
|
delay = base_delay
|
|
for attempt in range(retries):
|
|
try:
|
|
return socket.gethostbyname(dns)
|
|
except socket.gaierror:
|
|
if attempt == retries - 1:
|
|
raise
|
|
time.sleep(delay)
|
|
delay = min(delay * 1.5, 5)
|
|
|
|
return resolve
|
|
|
|
|
|
def get_cluster_dns_list(word_size: int) -> list[str]:
|
|
leader_dns = os.getenv("LWS_LEADER_ADDRESS")
|
|
if not leader_dns:
|
|
raise RuntimeError("LWS_LEADER_ADDRESS is not set")
|
|
|
|
workers = [f"vllm-0-{i}.vllm.vllm-project" for i in range(1, word_size)]
|
|
return [leader_dns] + workers
|
|
|
|
|
|
def get_cluster_ips(word_size: int = 2) -> list[str]:
|
|
resolver = dns_resolver()
|
|
return [resolver(dns) for dns in get_cluster_dns_list(word_size)]
|
|
|
|
|
|
def get_avaliable_port(start_port: int = 6000, end_port: int = 7000) -> int:
|
|
import socket
|
|
for port in range(start_port, end_port):
|
|
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
|
try:
|
|
s.bind(("", port))
|
|
return port
|
|
except OSError:
|
|
continue
|
|
raise RuntimeError("No available port found")
|
|
|
|
|
|
def get_cur_ip(retries: int = 20, base_delay: float = 0.5):
|
|
"""
|
|
Returns the pod/machine's primary IP address with retry.
|
|
This is necessary because network interfaces may not be ready
|
|
immediately after container startup.
|
|
"""
|
|
delay = base_delay
|
|
|
|
for attempt in range(retries):
|
|
try:
|
|
# Best method: UDP trick (doesn't actually send packets)
|
|
with socket.socket(socket.AF_INET, socket.SOCK_DGRAM) as s:
|
|
s.connect(("8.8.8.8", 80))
|
|
return s.getsockname()[0]
|
|
except Exception:
|
|
# fallback: hostname resolution
|
|
try:
|
|
return socket.gethostbyname(socket.gethostname())
|
|
except Exception:
|
|
if attempt == retries - 1:
|
|
raise RuntimeError("Failed to determine local IP address")
|
|
time.sleep(delay)
|
|
delay = min(delay * 1.5, 5)
|
|
|
|
|
|
def get_net_interface(ip: Optional[str] = None) -> Optional[str]:
|
|
"""
|
|
Returns specified IP's inetwork interface.
|
|
If no IP is provided, uses the first from hostname -I.
|
|
"""
|
|
if ip is None:
|
|
ip = get_cur_ip()
|
|
|
|
for iface, addrs in psutil.net_if_addrs().items():
|
|
for addr in addrs:
|
|
if addr.family == socket.AF_INET and addr.address == ip:
|
|
return iface
|
|
return None
|
|
|
|
|
|
def get_all_ipv4():
|
|
"""get all the ipv4 address for current node"""
|
|
ipv4s = set()
|
|
hostname = socket.gethostname()
|
|
|
|
for info in socket.getaddrinfo(hostname, None, family=socket.AF_INET):
|
|
ipv4s.add(info[4][0])
|
|
|
|
ipv4s.add("127.0.0.1")
|
|
|
|
return list(ipv4s)
|
|
|
|
|
|
def setup_logger():
|
|
"""Setup logging configuration."""
|
|
logging.basicConfig(
|
|
level=logging.INFO,
|
|
format="[%(asctime)s] [%(levelname)s] %(message)s",
|
|
datefmt="%Y-%m-%d %H:%M:%S",
|
|
)
|