Просмотр исходного кода

fix: 在 gpustack prerun 中启用 gpustack-server s6 服务

- gpustack/utils/s6_services.py 新增 gpustack_server_services 定义
- gpustack/cmd/prerun.py 在 determine_enabled_services 中加入 gpustack-server
- gpustack/cmd/prerun.py 在 determine_dependency_services 中加入依赖声明
- 确保 server/both 角色下 gpustack-server 会被 s6-overlay 自动启动
kinglee 1 неделя назад
Родитель
Сommit
0518305408
2 измененных файлов с 20 добавлено и 0 удалено
  1. 15 0
      gpustack/cmd/prerun.py
  2. 5 0
      gpustack/utils/s6_services.py

+ 15 - 0
gpustack/cmd/prerun.py

@@ -21,6 +21,7 @@ from gpustack.utils.s6_services import (
     postgres_services,
     migration_services,
     observability_services,
+    gpustack_server_services,
     all_services,
     gpustack_service_name,
 )
@@ -339,6 +340,13 @@ def determine_enabled_services(cfg: Config) -> List[str]:
     if use_builtin_grafana(cfg):
         services.extend(observability_services.all_services())
 
+    # gpustack server (always enabled for server/both roles)
+    if cfg.server_role() in [
+        Config.ServerRole.SERVER,
+        Config.ServerRole.BOTH,
+    ]:
+        services.extend(gpustack_server_services.all_services())
+
     return services
 
 
@@ -390,6 +398,13 @@ def determine_dependency_services(cfg: Config) -> List[str]:
     if cfg.gateway_mode == GatewayModeEnum.embedded:
         dependencies.extend(gateway_services.dep_services)
 
+    # gpustack server dependencies
+    if cfg.server_role() in [
+        Config.ServerRole.SERVER,
+        Config.ServerRole.BOTH,
+    ]:
+        dependencies.extend(gpustack_server_services.dep_services)
+
     return dependencies
 
 

+ 5 - 0
gpustack/utils/s6_services.py

@@ -68,6 +68,10 @@ class S6Services:
         return list(self.dependencies or [])
 
 
+gpustack_server_services = S6Services(
+    S6Service("gpustack-server", ["port", "proxy_port", "tls_port", "metrics_port", "api_port"], True),
+)
+
 gateway_services = S6Services(
     S6Service("apiserver", [18443], True),
     S6Service("pilot", [9876, 15010, 15012]),
@@ -95,6 +99,7 @@ def all_services() -> List[str]:
         *postgres_services.all_services(),
         *migration_services.all_services(),
         *observability_services.all_services(),
+        *gpustack_server_services.all_services(),
     ]