apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-05 16:48:03 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Feature] support controller port in multi api server (#3895)

Browse Source 
* fix scheduler bug

* fix

* Update api_server.py

* Update multi_api_server.py
This commit is contained in:
ltd0924
2025-09-05 13:38:58 +08:00
committed by GitHub
parent deb7ad205f
commit 55ebe855c0
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fastdeploy/entrypoints/openai/multi_api_server.py
View File

@@ -25,20 +25,30 @@ from fastdeploy.utils import get_logger, is_port_available
logger = get_logger("multi_api_server", "multi_api_server.log") logger = get_logger("multi_api_server", "multi_api_server.log")
def start_servers(server_count, server_args, ports, metrics_ports): def start_servers(server_count, server_args, ports, metrics_ports, controller_ports):
processes = [] processes = []
logger.info(f"Starting servers on ports: {ports} with args: {server_args} and metrics ports: {metrics_ports}") logger.info(f"Starting servers on ports: {ports} with args: {server_args} and metrics ports: {metrics_ports}")
for i in range(len(server_args)): for i in range(len(server_args)):
if server_args[i] == "--engine-worker-queue-port": if server_args[i] == "--engine-worker-queue-port":
engine_worker_queue_port = server_args[i + 1].split(",") engine_worker_queue_port = server_args[i + 1].split(",")
break break
check_param(ports, server_count) if not check_param(ports, server_count):
check_param(metrics_ports, server_count) return
check_param(engine_worker_queue_port, server_count) if not check_param(metrics_ports, server_count):
return
if not check_param(engine_worker_queue_port, server_count):
return
if controller_ports != "-1":
controller_ports = controller_ports.split(",")
if not check_param(controller_ports, server_count):
return
else:
controller_ports = [-1] * server_count
# check_param(server_args, server_count) # check_param(server_args, server_count)
for i in range(server_count): for i in range(server_count):
port = int(ports[i]) port = int(ports[i])
metrics_port = int(metrics_ports[i]) metrics_port = int(metrics_ports[i])
controller_port = int(controller_ports[i])
env = os.environ.copy() env = os.environ.copy()
env["FD_LOG_DIR"] = f"log_{i}" env["FD_LOG_DIR"] = f"log_{i}"
@@ -51,6 +61,8 @@ def start_servers(server_count, server_args, ports, metrics_ports):
str(port), str(port),
"--metrics-port", "--metrics-port",
str(metrics_port), str(metrics_port),
"--controller-port",
str(controller_port),
"--local-data-parallel-id", "--local-data-parallel-id",
str(i), str(i),
] ]
@@ -69,7 +81,8 @@ def check_param(ports, num_servers):
for port in ports: for port in ports:
logger.info(f"check port {port}") logger.info(f"check port {port}")
if not is_port_available("0.0.0.0", int(port)): if not is_port_available("0.0.0.0", int(port)):
raise ValueError(f"Port {port} is already in use.") return False
return True
def main(): def main():
@@ -77,6 +90,7 @@ def main():
parser.add_argument("--ports", default="8000,8002", type=str, help="ports to the http server") parser.add_argument("--ports", default="8000,8002", type=str, help="ports to the http server")
parser.add_argument("--num-servers", default=2, type=int, help="number of workers") parser.add_argument("--num-servers", default=2, type=int, help="number of workers")
parser.add_argument("--metrics-ports", default="8800,8802", type=str, help="ports for metrics server") parser.add_argument("--metrics-ports", default="8800,8802", type=str, help="ports for metrics server")
parser.add_argument("--controller-ports", default="-1", type=str, help="ports for controller server port")
parser.add_argument("--args", nargs=argparse.REMAINDER, help="remaining arguments are passed to api_server.py") parser.add_argument("--args", nargs=argparse.REMAINDER, help="remaining arguments are passed to api_server.py")
args = parser.parse_args() args = parser.parse_args()
@@ -90,6 +104,7 @@ def main():
server_args=args.args, server_args=args.args,
ports=args.ports.split(","), ports=args.ports.split(","),
metrics_ports=args.metrics_ports.split(","), metrics_ports=args.metrics_ports.split(","),
controller_ports=args.controller_ports,
) )
try: try: